amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2024-11-23 11:17:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zhuzichu 2023-12-14 22:06:26 +08:00
parent 5787e308dd
commit c95ac86377
5 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
example/CMakeLists.txt
View File

@ -3,10 +3,9 @@ cmake_minimum_required(VERSION 3.20)
project(example VERSION 1.0) project(example VERSION 1.0)
#配置通用编译 #配置通用编译
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
if(APPLE)
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
endif()
#导入exmaple的QML位置，不然import example有时候会爆红 #导入exmaple的QML位置，不然import example有时候会爆红
set(QML_IMPORT_PATH ${CMAKE_BINARY_DIR}/example CACHE STRING "Qt Creator extra QML import paths" FORCE) set(QML_IMPORT_PATH ${CMAKE_BINARY_DIR}/example CACHE STRING "Qt Creator extra QML import paths" FORCE)

1
example/src/helper/Log.cpp
View File

@ -9,6 +9,7 @@
#include <QDir> #include <QDir>
#include <QThread> #include <QThread>
#include <QSettings> #include <QSettings>
#include <QRegularExpression>
#include "Version.h" #include "Version.h"
#ifdef WIN32 #ifdef WIN32
#include <process.h> #include <process.h>

5
src/CMakeLists.txt
View File

@ -7,10 +7,9 @@ else()
endif() endif()
#配置通用编译 #配置通用编译
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
if(APPLE)
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
endif()
if (FLUENTUI_BUILD_STATIC_LIB) if (FLUENTUI_BUILD_STATIC_LIB)
add_definitions(-DFLUENTUI_BUILD_STATIC_LIB) add_definitions(-DFLUENTUI_BUILD_STATIC_LIB)

15
src/Qt5/imports/FluentUI/Controls/FluAppBar.qml
View File

@ -34,10 +34,17 @@ Rectangle{
property bool isMac: FluTools.isMacos() property bool isMac: FluTools.isMacos()
property color borerlessColor : FluTheme.primaryColor property color borerlessColor : FluTheme.primaryColor
property var maxClickListener : function(){ property var maxClickListener : function(){
if (d.win.visibility === Window.Maximized) if(FluTools.isMacos()){
d.win.visibility = Window.Windowed if (d.win.visibility === Window.FullScreen)
else d.win.visibility = Window.Windowed
d.win.visibility = Window.Maximized else
d.win.visibility = Window.FullScreen
}else{
if (d.win.visibility === Window.Maximized)
d.win.visibility = Window.Windowed
else
d.win.visibility = Window.Maximized
}
} }
property var minClickListener: function(){ property var minClickListener: function(){
d.win.visibility = Window.Minimized d.win.visibility = Window.Minimized

15
src/Qt6/imports/FluentUI/Controls/FluAppBar.qml
View File

@ -34,10 +34,17 @@ Rectangle{
property bool isMac: FluTools.isMacos() property bool isMac: FluTools.isMacos()
property color borerlessColor : FluTheme.primaryColor property color borerlessColor : FluTheme.primaryColor
property var maxClickListener : function(){ property var maxClickListener : function(){
if (d.win.visibility === Window.Maximized) if(FluTools.isMacos()){
d.win.visibility = Window.Windowed if (d.win.visibility === Window.FullScreen)
else d.win.visibility = Window.Windowed
d.win.visibility = Window.Maximized else
d.win.visibility = Window.FullScreen
}else{
if (d.win.visibility === Window.Maximized)
d.win.visibility = Window.Windowed
else
d.win.visibility = Window.Maximized
}
} }
property var minClickListener: function(){ property var minClickListener: function(){
d.win.visibility = Window.Minimized d.win.visibility = Window.Minimized