example/CMakeLists.txt

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

example/qml-Qt6/window/MainWindow.qml

@@ -42,15 +42,7 @@ FluWindow {
     }
 
     onFirstVisible: {
-        timer_tour_delay.restart()
-    }
-
-    Timer{
-        id:timer_tour_delay
-        interval: 200
-        onTriggered: {
-            tour.open()
-        }
+        tour.open()
     }
 
     Component.onCompleted: {

example/qml/window/MainWindow.qml

@@ -45,15 +45,7 @@ FluWindow {
     }
 
     onFirstVisible: {
-        timer_tour_delay.restart()
-    }
-
-    Timer{
-        id:timer_tour_delay
-        interval: 200
-        onTriggered: {
-            tour.open()
-        }
+        tour.open()
     }
 
     Component.onCompleted: {

example/src/helper/Log.cpp

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

src/CMakeLists.txt

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

src/Qt5/imports/FluentUI/Controls/FluAppBar.qml

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

src/Qt6/imports/FluentUI/Controls/FluAppBar.qml

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