update

🐛 修复宏定义错误导致无法编译

.github/workflows/ubuntu.yml

@@ -56,7 +56,7 @@ jobs:
       - name: package
         run: |
           # make sure Qt plugin finds QML sources so it can deploy the imported files
-          export QML_SOURCES_PATHS=src
+          export QML_SOURCES_PATHS=./
           # 拷贝依赖
           linuxdeploy-x86_64.AppImage --plugin=qt --output=appimage --create-desktop-file --icon-file=${targetName}.svg --executable=bin/release/${targetName} --appdir bin/release/
           mv ${{ env.targetName }}-*.AppImage ${{ env.targetName }}.AppImage

example/App.qml

@@ -1,26 +0,0 @@
-import QtQuick
-import QtQuick.Window
-import QtQuick.Controls
-import QtQuick.Layouts
-import FluentUI
-
-Window {
-    id:app
-    Component.onCompleted: {
-        FluApp.init(app)
-        FluTheme.frameless = ("windows" === Qt.platform.os)
-        FluTheme.darkMode = FluDarkMode.System
-        FluApp.routes = {
-            "/":"qrc:/page/MainPage.qml",
-            "/about":"qrc:/page/AboutPage.qml",
-            "/login":"qrc:/page/LoginPage.qml",
-            "/chat":"qrc:/page/ChatPage.qml",
-            "/media":"qrc:/page/MediaPage.qml",
-            "/singleTaskWindow":"qrc:/page/SingleTaskWindow.qml",
-            "/standardWindow":"qrc:/page/StandardWindow.qml",
-            "/singleInstanceWindow":"qrc:/page/SingleInstanceWindow.qml"
-        }
-        FluApp.initialRoute = "/"
-        FluApp.run()
-    }
-}

example/CMakeLists.txt

@@ -24,14 +24,23 @@ endif()
 find_package(Qt6 COMPONENTS Core Quick QuickControls2 Concurrent Network Multimedia REQUIRED)
 
 set(SOURCES
-    ChatController.cpp
+    src/controller/ChatController.cpp
-	AppInfo.cpp 
+    src/AppInfo.cpp
-    main.cpp
+    src/main.cpp
+    src/lang/Lang.cpp
+    src/lang/Zh.cpp
+    src/lang/En.cpp
+    src/tool/IPC.cpp
 )
 
 set(HEADERS
-    ChatController.h
+    src/controller/ChatController.h
-	AppInfo.h
+    src/AppInfo.h
+    src/stdafx.h
+    src/lang/Lang.h
+    src/lang/Zh.h
+    src/lang/En.h
+    src/tool/IPC.h
 )
 
 set(RESOURCES

example/example.pro

@@ -3,20 +3,22 @@ CONFIG += c++17
 DEFINES += QT_DEPRECATED_WARNINGS QT_NO_WARNING_OUTPUT
 
 HEADERS += \
-    lang/En.h \
+    src/lang/En.h \
-    lang/Lang.h \
+    src/lang/Lang.h \
-    lang/Zh.h \
+    src/lang/Zh.h \
-    stdafx.h \
+    src/stdafx.h \
-    ChatController.h \
+    src/controller/ChatController.h \
-    AppInfo.h
+    src/AppInfo.h \
+    src/tool/IPC.h
 
 SOURCES += \
-        ChatController.cpp \
+        src/controller/ChatController.cpp \
-        AppInfo.cpp \
+        src/AppInfo.cpp \
-        lang/En.cpp \
+        src/lang/En.cpp \
-        lang/Lang.cpp \
+        src/lang/Lang.cpp \
-        lang/Zh.cpp \
+        src/lang/Zh.cpp \
-        main.cpp
+        src/main.cpp \
+        src/tool/IPC.cpp
 
 RESOURCES += qml.qrc
 
@@ -50,3 +52,8 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 mac: {
     QMAKE_INFO_PLIST = Info.plist
 }
+
+#### 如果你正在使用静态库，请将将下面的配置注释取消掉。
+#DEFINES += STATICLIB
+#INCLUDEPATH += $$OUT_PWD/../bin/FluentUI/
+#LIBS += -L$$OUT_PWD/../bin/FluentUI/ -lFluentUI

example/qml.qrc

@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>App.qml</file>
         <file>res/image/image_huoyin.webp</file>
         <file>res/svg/avatar_1.svg</file>
         <file>res/svg/avatar_2.svg</file>
@@ -14,40 +13,11 @@
         <file>res/svg/avatar_10.svg</file>
         <file>res/svg/avatar_11.svg</file>
         <file>res/svg/avatar_12.svg</file>
-        <file>page/AboutPage.qml</file>
-        <file>page/MainPage.qml</file>
-        <file>page/LoginPage.qml</file>
-        <file>T_ToggleSwitch.qml</file>
-        <file>T_Typography.qml</file>
-        <file>T_Awesome.qml</file>
-        <file>T_Buttons.qml</file>
-        <file>T_Rectangle.qml</file>
-        <file>T_InfoBar.qml</file>
-        <file>T_Progress.qml</file>
-        <file>T_Slider.qml</file>
-        <file>T_TextBox.qml</file>
-        <file>T_Theme.qml</file>
-        <file>T_Dialog.qml</file>
-        <file>T_TreeView.qml</file>
-        <file>T_Expander.qml</file>
-        <file>T_TimePicker.qml</file>
-        <file>T_DatePicker.qml</file>
-        <file>T_MultiWindow.qml</file>
-        <file>T_Menu.qml</file>
         <file>res/image/banner_1.jpg</file>
         <file>res/image/banner_2.jpg</file>
         <file>res/image/banner_3.jpg</file>
         <file>res/image/logo_openai.png</file>
-        <file>page/ChatPage.qml</file>
-        <file>T_Tooltip.qml</file>
-        <file>T_Badge.qml</file>
-        <file>T_CalendarPicker.qml</file>
-        <file>T_ColorPicker.qml</file>
-        <file>T_Carousel.qml</file>
-        <file>T_MediaPlayer.qml</file>
-        <file>T_TabView.qml</file>
         <file>res/image/favicon.ico</file>
-        <file>T_Home.qml</file>
         <file>res/image/bg_home_header.png</file>
         <file>res/image/ic_home_github.png</file>
         <file>res/image/control/Acrylic.png</file>
@@ -148,25 +118,56 @@
         <file>res/image/control/Viewbox.png</file>
         <file>res/image/control/WebView.png</file>
         <file>res/image/control/XamlUICommand.png</file>
-        <file>T_CheckBox.qml</file>
-        <file>global/ItemsOriginal.qml</file>
-        <file>global/qmldir</file>
-        <file>global/ItemsFooter.qml</file>
-        <file>page/MediaPage.qml</file>
-        <file>T_FlipView.qml</file>
-        <file>T_Pivot.qml</file>
-        <file>component/CodeExpander.qml</file>
-        <file>T_TableView.qml</file>
-        <file>T_StatusView.qml</file>
-        <file>T_Settings.qml</file>
-        <file>global/MainEvent.qml</file>
         <file>res/svg/home.svg</file>
         <file>res/svg/home_dark.svg</file>
-        <file>page/StandardWindow.qml</file>
-        <file>page/SingleTaskWindow.qml</file>
-        <file>page/SingleInstanceWindow.qml</file>
-        <file>T_RatingControl.qml</file>
         <file>res/image/qrcode_wx.jpg</file>
         <file>res/image/qrcode_zfb.jpg</file>
+        <file>qml/component/CodeExpander.qml</file>
+        <file>qml/global/ItemsFooter.qml</file>
+        <file>qml/global/ItemsOriginal.qml</file>
+        <file>qml/global/MainEvent.qml</file>
+        <file>qml/global/qmldir</file>
+        <file>qml/App.qml</file>
+        <file>qml/window/AboutWindow.qml</file>
+        <file>qml/window/ChatWindow.qml</file>
+        <file>qml/window/LoginWindow.qml</file>
+        <file>qml/window/MainWindow.qml</file>
+        <file>qml/window/MediaWindow.qml</file>
+        <file>qml/window/SingleInstanceWindow.qml</file>
+        <file>qml/window/SingleTaskWindow.qml</file>
+        <file>qml/window/StandardWindow.qml</file>
+        <file>qml/page/T_Awesome.qml</file>
+        <file>qml/page/T_Badge.qml</file>
+        <file>qml/page/T_Buttons.qml</file>
+        <file>qml/page/T_CalendarPicker.qml</file>
+        <file>qml/page/T_Carousel.qml</file>
+        <file>qml/page/T_CheckBox.qml</file>
+        <file>qml/page/T_ColorPicker.qml</file>
+        <file>qml/page/T_DatePicker.qml</file>
+        <file>qml/page/T_Dialog.qml</file>
+        <file>qml/page/T_Expander.qml</file>
+        <file>qml/page/T_FlipView.qml</file>
+        <file>qml/page/T_Home.qml</file>
+        <file>qml/page/T_InfoBar.qml</file>
+        <file>qml/page/T_MediaPlayer.qml</file>
+        <file>qml/page/T_Menu.qml</file>
+        <file>qml/page/T_MultiWindow.qml</file>
+        <file>qml/page/T_Pivot.qml</file>
+        <file>qml/page/T_Progress.qml</file>
+        <file>qml/page/T_RatingControl.qml</file>
+        <file>qml/page/T_Rectangle.qml</file>
+        <file>qml/page/T_Settings.qml</file>
+        <file>qml/page/T_Slider.qml</file>
+        <file>qml/page/T_StatusView.qml</file>
+        <file>qml/page/T_TableView.qml</file>
+        <file>qml/page/T_TabView.qml</file>
+        <file>qml/page/T_TextBox.qml</file>
+        <file>qml/page/T_Theme.qml</file>
+        <file>qml/page/T_TimePicker.qml</file>
+        <file>qml/page/T_ToggleSwitch.qml</file>
+        <file>qml/page/T_Tooltip.qml</file>
+        <file>qml/page/T_TreeView.qml</file>
+        <file>qml/page/T_Typography.qml</file>
+        <file>qml/page/T_BreadcrumbBar.qml</file>
     </qresource>
 </RCC>

example/qml/App.qml

@@ -0,0 +1,26 @@
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Layouts
+import FluentUI
+
+Window {
+    id:app
+    Component.onCompleted: {
+        FluApp.init(app)
+        FluTheme.frameless = ("windows" === Qt.platform.os)
+        FluTheme.darkMode = FluDarkMode.System
+        FluApp.routes = {
+            "/":"qrc:/qml/window/MainWindow.qml",
+            "/about":"qrc:/qml/window/AboutWindow.qml",
+            "/login":"qrc:/qml/window/LoginWindow.qml",
+            "/chat":"qrc:/qml/window/ChatWindow.qml",
+            "/media":"qrc:/qml/window/MediaWindow.qml",
+            "/singleTaskWindow":"qrc:/qml/window/SingleTaskWindow.qml",
+            "/standardWindow":"qrc:/qml/window/StandardWindow.qml",
+            "/singleInstanceWindow":"qrc:/qml/window/SingleInstanceWindow.qml"
+        }
+        FluApp.initialRoute = "/"
+        FluApp.run()
+    }
+}

example/qml/component/CodeExpander.qml

@@ -119,7 +119,8 @@ FluExpander{
           "FluTheme",
           "FluStatusView",
           "FluRatingControl",
-          "FluPasswordBox"
+          "FluPasswordBox",
+          "FluBreadcrumbBar"
       ];
       code = code.replace(/\n/g, "<br>");
       code = code.replace(/ /g, "&nbsp;");

example/qml/global/ItemsFooter.qml

@@ -20,7 +20,7 @@ FluObject{
         title:lang.settings
         icon:FluentIcons.Settings
         onTap:{
-            navigationView.push("qrc:/T_Settings.qml")
+            navigationView.push("qrc:/qml/page/T_Settings.qml")
         }
     }
 }

example/qml/global/ItemsOriginal.qml

@@ -18,7 +18,7 @@ FluObject{
             height: 18
         }
         onTap:{
-            navigationView.push("qrc:/T_Home.qml")
+            navigationView.push("qrc:/qml/page/T_Home.qml")
         }
     }
 
@@ -31,7 +31,7 @@ FluObject{
             recentlyUpdated:true
             desc:"A control that responds to user input and raisesa Click event."
             onTap:{
-                navigationView.push("qrc:/T_Buttons.qml")
+                navigationView.push("qrc:/qml/page/T_Buttons.qml")
             }
         }
         FluPaneItem{
@@ -40,7 +40,7 @@ FluObject{
             recentlyUpdated:true
             desc:"A control that lets the user select from a rangeof values by moving a Thumb control along atrack."
             onTap:{
-                navigationView.push("qrc:/T_Slider.qml")
+                navigationView.push("qrc:/qml/page/T_Slider.qml")
             }
         }
         FluPaneItem{
@@ -49,13 +49,13 @@ FluObject{
             recentlyUpdated:true
             desc:"A control that a user can select or clear."
             onTap:{
-                navigationView.push("qrc:/T_CheckBox.qml")
+                navigationView.push("qrc:/qml/page/T_CheckBox.qml")
             }
         }
         FluPaneItem{
             title:"ToggleSwitch"
             onTap:{
-                navigationView.push("qrc:/T_ToggleSwitch.qml")
+                navigationView.push("qrc:/qml/page/T_ToggleSwitch.qml")
             }
         }
     }
@@ -66,31 +66,31 @@ FluObject{
         FluPaneItem{
             title:"TextBox"
             onTap:{
-                navigationView.push("qrc:/T_TextBox.qml")
+                navigationView.push("qrc:/qml/page/T_TextBox.qml")
             }
         }
         FluPaneItem{
             title:"TimePicker"
             onTap:{
-                navigationView.push("qrc:/T_TimePicker.qml")
+                navigationView.push("qrc:/qml/page/T_TimePicker.qml")
             }
         }
         FluPaneItem{
             title:"DatePicker"
             onTap:{
-                navigationView.push("qrc:/T_DatePicker.qml")
+                navigationView.push("qrc:/qml/page/T_DatePicker.qml")
             }
         }
         FluPaneItem{
             title:"CalendarPicker"
             onTap:{
-                navigationView.push("qrc:/T_CalendarPicker.qml")
+                navigationView.push("qrc:/qml/page/T_CalendarPicker.qml")
             }
         }
         FluPaneItem{
             title:"ColorPicker"
             onTap:{
-                navigationView.push("qrc:/T_ColorPicker.qml")
+                navigationView.push("qrc:/qml/page/T_ColorPicker.qml")
             }
         }
     }
@@ -104,49 +104,49 @@ FluObject{
             recentlyUpdated:true
             desc:"An inline message to display app-wide statuschange information."
             onTap:{
-                navigationView.push("qrc:/T_InfoBar.qml")
+                navigationView.push("qrc:/qml/page/T_InfoBar.qml")
             }
         }
         FluPaneItem{
             title:"Progress"
             onTap:{
-                navigationView.push("qrc:/T_Progress.qml")
+                navigationView.push("qrc:/qml/page/T_Progress.qml")
             }
         }
         FluPaneItem{
             title:"RatingControl"
             onTap:{
-                navigationView.push("qrc:/T_RatingControl.qml")
+                navigationView.push("qrc:/qml/page/T_RatingControl.qml")
             }
         }
         FluPaneItem{
             title:"Badge"
             onTap:{
-                navigationView.push("qrc:/T_Badge.qml")
+                navigationView.push("qrc:/qml/page/T_Badge.qml")
             }
         }
         FluPaneItem{
             title:"Rectangle"
             onTap:{
-                navigationView.push("qrc:/T_Rectangle.qml")
+                navigationView.push("qrc:/qml/page/T_Rectangle.qml")
             }
         }
         FluPaneItem{
             title:"StatusView"
             onTap:{
-                navigationView.push("qrc:/T_StatusView.qml")
+                navigationView.push("qrc:/qml/page/T_StatusView.qml")
             }
         }
         FluPaneItem{
             title:"Carousel"
             onTap:{
-                navigationView.push("qrc:/T_Carousel.qml")
+                navigationView.push("qrc:/qml/page/T_Carousel.qml")
             }
         }
         FluPaneItem{
             title:"Expander"
             onTap:{
-                navigationView.push("qrc:/T_Expander.qml")
+                navigationView.push("qrc:/qml/page/T_Expander.qml")
             }
         }
     }
@@ -157,19 +157,19 @@ FluObject{
         FluPaneItem{
             title:"Dialog"
             onTap:{
-                navigationView.push("qrc:/T_Dialog.qml")
+                navigationView.push("qrc:/qml/page/T_Dialog.qml")
             }
         }
         FluPaneItem{
             title:"Tooltip"
             onTap:{
-                navigationView.push("qrc:/T_Tooltip.qml")
+                navigationView.push("qrc:/qml/page/T_Tooltip.qml")
             }
         }
         FluPaneItem{
             title:"Menu"
             onTap:{
-                navigationView.push("qrc:/T_Menu.qml")
+                navigationView.push("qrc:/qml/page/T_Menu.qml")
             }
         }
     }
@@ -184,7 +184,13 @@ FluObject{
             order:3
             desc:"Presents information from different sources in atabbed view."
             onTap:{
-                navigationView.push("qrc:/T_Pivot.qml")
+                navigationView.push("qrc:/qml/page/T_Pivot.qml")
+            }
+        }
+        FluPaneItem{
+            title:"BreadcrumbBar"
+            onTap:{
+                navigationView.push("qrc:/qml/page/T_BreadcrumbBar.qml")
             }
         }
         FluPaneItem{
@@ -194,13 +200,13 @@ FluObject{
             order:1
             desc:"A control that displays a collection of tabs thatcan be used to display several documents."
             onTap:{
-                navigationView.push("qrc:/T_TabView.qml")
+                navigationView.push("qrc:/qml/page/T_TabView.qml")
             }
         }
         FluPaneItem{
             title:"TreeView"
             onTap:{
-                navigationView.push("qrc:/T_TreeView.qml")
+                navigationView.push("qrc:/qml/page/T_TreeView.qml")
             }
         }
         FluPaneItem{
@@ -210,13 +216,13 @@ FluObject{
             order:4
             desc:"The TableView control provides a flexible way to display a collection of data in rows and columns"
             onTap:{
-                navigationView.push("qrc:/T_TableView.qml")
+                navigationView.push("qrc:/qml/page/T_TableView.qml")
             }
         }
         FluPaneItem{
             title:"MultiWindow"
             onTap:{
-                navigationView.push("qrc:/T_MultiWindow.qml")
+                navigationView.push("qrc:/qml/page/T_MultiWindow.qml")
             }
         }
         FluPaneItem{
@@ -226,7 +232,7 @@ FluObject{
             order:2
             desc:"Presents a collection of items that the user canflip through, one item at a time."
             onTap:{
-                navigationView.push("qrc:/T_FlipView.qml")
+                navigationView.push("qrc:/qml/page/T_FlipView.qml")
             }
         }
     }
@@ -237,19 +243,19 @@ FluObject{
         FluPaneItem{
             title:"Theme"
             onTap:{
-                navigationView.push("qrc:/T_Theme.qml")
+                navigationView.push("qrc:/qml/page/T_Theme.qml")
             }
         }
         FluPaneItem{
             title:"Typography"
             onTap:{
-                navigationView.push("qrc:/T_Typography.qml")
+                navigationView.push("qrc:/qml/page/T_Typography.qml")
             }
         }
         FluPaneItem{
             title:"Awesome"
             onTap:{
-                navigationView.push("qrc:/T_Awesome.qml")
+                navigationView.push("qrc:/qml/page/T_Awesome.qml")
             }
         }
     }
@@ -264,7 +270,7 @@ FluObject{
             order:0
             desc:"A control to display video and image content."
             onTap:{
-                navigationView.push("qrc:/T_MediaPlayer.qml")
+                navigationView.push("qrc:/qml/page/T_MediaPlayer.qml")
             }
         }
     }

example/qml/page/T_Badge.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_BreadcrumbBar.qml

@@ -0,0 +1,98 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+import "../component"
+
+FluScrollablePage{
+
+    title:"BreadcurmbBar"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+    spacing: 0
+
+    Component.onCompleted: {
+        var items = []
+        for(var i=0;i<10;i++){
+            items.push({title:"Item_"+(i+1)})
+        }
+        breadcrumb_1.items = items
+        breadcrumb_2.items = items
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        paddings: 10
+        Layout.topMargin: 20
+
+        FluBreadcrumbBar{
+            id:breadcrumb_1
+            width:parent.width
+            anchors.verticalCenter: parent.verticalCenter
+            onClickItem:
+                (model)=>{
+                    showSuccess(model.title)
+                }
+        }
+    }
+
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 100
+        paddings: 10
+        Layout.topMargin: 20
+
+        ColumnLayout{
+            anchors.verticalCenter: parent.verticalCenter
+            width:parent.width
+            spacing: 10
+
+            FluFilledButton{
+                text:"Reset sample"
+                onClicked:{
+                    var items = []
+                    for(var i=0;i<10;i++){
+                        items.push({title:"Item_"+(i+1)})
+                    }
+                     breadcrumb_2.items = items
+                }
+            }
+
+            FluBreadcrumbBar{
+                id:breadcrumb_2
+                separator:">"
+                spacing:8
+                textSize:18
+                Layout.fillWidth: true
+                onClickItem:
+                    (model)=>{
+                        //不是点击最后一个item元素
+                        if(model.index+1!==count()){
+                            breadcrumb_2.remove(model.index+1,count()-model.index-1)
+                        }
+                        showSuccess(model.title)
+                    }
+            }
+        }
+    }
+
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluBreadcrumbBar{
+    width:parent.width
+    separator:">"
+    spacing:8
+    textSize:18
+    onClickItem: (model)=>{
+
+    }
+}'
+    }
+
+
+}

example/qml/page/T_Buttons.qml

@@ -4,7 +4,7 @@ import QtQuick.Window
 import QtQuick.Controls
 import QtQuick.Controls.Basic
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
     title:"Buttons"

example/qml/page/T_CalendarPicker.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Carousel.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_CheckBox.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_ColorPicker.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_DatePicker.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Dialog.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Expander.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_FlipView.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Home.qml

@@ -2,7 +2,7 @@
 import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
-import "qrc:///global/"
+import "qrc:///qml/global/"
 import FluentUI
 
 FluScrollablePage{

example/qml/page/T_InfoBar.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_MediaPlayer.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Menu.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_MultiWindow.qml

@@ -3,12 +3,12 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 
     property string password: ""
-    property var loginPageRegister: registerForPageResult("/login")
+    property var loginPageRegister: registerForWindowResult("/login")
 
     title:"MultiWindow"
     leftPadding:10
@@ -168,7 +168,7 @@ FluScrollablePage{
     CodeExpander{
         Layout.fillWidth: true
         Layout.topMargin: -1
-        code:'property var loginPageRegister: registerForPageResult("/login")
+        code:'property var loginPageRegister: registerForWindowResult("/login")
 
 Connections{
     target: loginPageRegister

example/qml/page/T_Pivot.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Progress.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_RatingControl.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Rectangle.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Controls
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Settings.qml

@@ -3,8 +3,8 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "qrc:///global/"
+import "qrc:///qml/global/"
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Slider.qml

@@ -2,7 +2,7 @@
 import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
-import "./component"
+import "../component"
 import FluentUI
 
 FluScrollablePage{

example/qml/page/T_StatusView.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Controls
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_TabView.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_TableView.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 
@@ -68,8 +68,8 @@ FluScrollablePage{
                     text:"编辑"
                     topPadding:3
                     bottomPadding:3
-                    leftPadding:3
+                    leftPadding:6
-                    rightPadding:3
+                    rightPadding:6
                     onClicked:{
                         console.debug(dataModel.index)
                         showSuccess(JSON.stringify(dataObject))
@@ -79,8 +79,8 @@ FluScrollablePage{
                     text:"删除"
                     topPadding:3
                     bottomPadding:3
-                    leftPadding:3
+                    leftPadding:6
-                    rightPadding:3
+                    rightPadding:6
                     onClicked:{
                         showError(JSON.stringify(dataObject))
                     }

example/qml/page/T_TextBox.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Theme.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_TimePicker.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_ToggleSwitch.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Tooltip.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_TreeView.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage {
 

example/qml/window/AboutWindow.qml

@@ -6,7 +6,7 @@ import FluentUI
 FluWindow {
 
     id:window
-
+    title:"关于"
     width: 600
     height: 600
     minimumWidth: 600
@@ -15,8 +15,6 @@ FluWindow {
     maximumHeight: 600
     launchMode: FluWindow.SingleTask
 
-    title:"关于"
-
     FluAppBar{
         id:appbar
         title:"关于"

example/qml/window/ChatWindow.qml

@@ -7,13 +7,12 @@ import QtQuick.Dialogs
 
 FluWindow {
 
+    title:"ChatGPT"
     width: 680
     height: 600
     minimumWidth: 500
     minimumHeight: 600
 
-    title:"ChatGPT"
-
     onInitArgument:
         (argument)=>{
             scrollview.focus = true

example/qml/window/LoginWindow.qml

@@ -6,13 +6,13 @@ import FluentUI
 FluWindow {
 
     id:window
+    title:"登录"
     width: 400
     height: 400
     minimumWidth: 400
     minimumHeight: 400
     maximumWidth: 400
     maximumHeight: 400
-    title:"登录"
 
     onInitArgument:
         (argument)=>{

example/qml/window/MainWindow.qml

@@ -4,13 +4,14 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Qt.labs.platform
 import FluentUI
-import "qrc:///global/"
+import "qrc:///qml/global/"
 
 FluWindow {
+
     id:window
+    title: "FluentUI"
     width: 1000
     height: 640
-    title: "FluentUI"
     closeDestory:false
     minimumWidth: 520
     minimumHeight: 460
@@ -20,6 +21,15 @@ FluWindow {
         event.accepted = false
     }
 
+    Connections{
+        target: appInfo
+        function onActiveWindow(){
+            window.show()
+            window.raise()
+            window.requestActivate()
+        }
+    }
+
     FluAppBar{
         id:appbar
         z:9

example/qml/window/MediaWindow.qml

@@ -5,13 +5,12 @@ import FluentUI
 
 FluWindow {
 
+    title:"视频播放器"
     width: 640
     height: 480
     minimumWidth: 640
     minimumHeight: 480
 
-    title:"视频播放器"
-
     onInitArgument:
         (argument)=>{
             player.source = argument.source
@@ -23,7 +22,6 @@ FluWindow {
         width:parent.width
     }
 
-
     FluMediaPlayer{
         id:player
         anchors{

example/qml/window/SingleInstanceWindow.qml

@@ -6,7 +6,7 @@ import FluentUI
 FluWindow {
 
     id:window
-
+    title:"SingleInstance"
     width: 500
     height: 600
     minimumWidth: 500
@@ -15,8 +15,6 @@ FluWindow {
     maximumHeight: 600
     launchMode: FluWindow.SingleInstance
 
-    title:"SingleInstance"
-
     FluAppBar{
         id:appbar
         title:"SingleInstance"

example/qml/window/SingleTaskWindow.qml

@@ -6,7 +6,7 @@ import FluentUI
 FluWindow {
 
     id:window
-
+    title:"SingleTask"
     width: 500
     height: 600
     minimumWidth: 500
@@ -15,8 +15,6 @@ FluWindow {
     maximumHeight: 600
     launchMode: FluWindow.SingleTask
 
-    title:"SingleTask"
-
     FluAppBar{
         id:appbar
         title:"SingleTask"

example/qml/window/StandardWindow.qml

@@ -6,7 +6,7 @@ import FluentUI
 FluWindow {
 
     id:window
-
+    title:"Standard"
     width: 500
     height: 600
     minimumWidth: 500
@@ -15,8 +15,6 @@ FluWindow {
     maximumHeight: 600
     launchMode: FluWindow.Standard
 
-    title:"Standard"
-
     FluAppBar{
         id:appbar
         title:"Standard"

example/src/AppInfo.cpp

@@ -2,11 +2,10 @@
 #include "lang/En.h"
 #include "lang/Zh.h"
 
-
 AppInfo::AppInfo(QObject *parent)
     : QObject{parent}
 {
-    version("1.2.6");
+    version("1.2.7");
     lang(new En());
 }
 

example/src/AppInfo.h

@@ -13,6 +13,7 @@ class AppInfo : public QObject
 public:
     explicit AppInfo(QObject *parent = nullptr);
     Q_INVOKABLE void changeLang(const QString& locale);
+    Q_SIGNAL void activeWindow();
 };
 
 #endif // APPINFO_H

example/src/controller/ChatController.h

@@ -11,7 +11,7 @@
 #include <QClipboard>
 #include <QByteArray>
 #include <QFile>
-#include "stdafx.h"
+#include "../stdafx.h"
 
 class ChatController : public QObject
 {

example/src/lang/Lang.h

@@ -2,7 +2,7 @@
 #define LANG_H
 
 #include <QObject>
-#include "stdafx.h"
+#include "../stdafx.h"
 
 class Lang : public QObject
 {

example/src/main.cpp

@@ -6,7 +6,11 @@
 #include <QProcess>
 #include "lang/Lang.h"
 #include "AppInfo.h"
-#include "ChatController.h"
+#include "controller/ChatController.h"
+#include "tool/IPC.h"
+#if defined(STATICLIB)
+#include <FluentUI.h>
+#endif
 
 int main(int argc, char *argv[])
 {
@@ -19,12 +23,28 @@ int main(int argc, char *argv[])
     QGuiApplication::setOrganizationName("ZhuZiChu");
     QGuiApplication::setOrganizationDomain("https://zhuzichu520.github.io");
     QGuiApplication::setApplicationName("FluentUI");
-//    QQuickWindow::setGraphicsApi(QSGRendererInterface::Software);
+    //    QQuickWindow::setGraphicsApi(QSGRendererInterface::Software);
     QGuiApplication app(argc, argv);
+    AppInfo* appInfo = new AppInfo();
+    IPC ipc(0);
+    QString activeWindowEvent = "activeWindow";
+    if(!ipc.isCurrentOwner()){
+        ipc.postEvent(activeWindowEvent,QString().toUtf8(),0);
+        delete appInfo;
+        return 0;
+    }
+    if(ipc.isAttached()){
+        ipc.registerEventHandler(activeWindowEvent,[&appInfo](const QByteArray&){
+            Q_EMIT appInfo->activeWindow();
+            return true;
+        });
+    }
     app.setQuitOnLastWindowClosed(false);
     QQmlApplicationEngine engine;
+#if defined(STATICLIB)
+    FluentUI::initialize(&engine);
+#endif
     qmlRegisterType<ChatController>("Controller",1,0,"ChatController");
-    AppInfo* appInfo = new AppInfo();
     QQmlContext * context = engine.rootContext();
     Lang* lang = appInfo->lang();
     context->setContextProperty("lang",lang);
@@ -32,12 +52,12 @@ int main(int argc, char *argv[])
         context->setContextProperty("lang",appInfo->lang());
     });
     context->setContextProperty("appInfo",appInfo);
-    const QUrl url(QStringLiteral("qrc:/App.qml"));
+    const QUrl url(QStringLiteral("qrc:/qml/App.qml"));
     QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
-                     &app, [url](QObject *obj, const QUrl &objUrl) {
+        &app, [url](QObject *obj, const QUrl &objUrl) {
-        if (!obj && url == objUrl)
+            if (!obj && url == objUrl)
-            QCoreApplication::exit(-1);
+                QCoreApplication::exit(-1);
-    }, Qt::QueuedConnection);
+        }, Qt::QueuedConnection);
     engine.load(url);
     return app.exec();
 }

example/src/tool/IPC.cpp

@@ -0,0 +1,250 @@
+#include "IPC.h"
+
+#include <QCoreApplication>
+#include <QDebug>
+#include <QThread>
+#include <ctime>
+#include <random>
+
+
+IPC::IPC(uint32_t profileId)
+    : profileId{profileId}
+    , globalMemory{"ipc-" IPC_PROTOCOL_VERSION}
+{
+    qRegisterMetaType<IPCEventHandler>("IPCEventHandler");
+    timer.setInterval(EVENT_TIMER_MS);
+    timer.setSingleShot(true);
+    connect(&timer, &QTimer::timeout, this, &IPC::processEvents);
+    std::default_random_engine randEngine((std::random_device())());
+    std::uniform_int_distribution<uint64_t> distribution;
+    globalId = distribution(randEngine);
+    qDebug() << "Our global IPC ID is " << globalId;
+    if (globalMemory.create(sizeof(IPCMemory))) {
+        if (globalMemory.lock()) {
+            IPCMemory* mem = global();
+            memset(mem, 0, sizeof(IPCMemory));
+            mem->globalId = globalId;
+            mem->lastProcessed = time(nullptr);
+            globalMemory.unlock();
+        } else {
+            qWarning() << "Couldn't lock to take ownership";
+        }
+    } else if (globalMemory.attach()) {
+        qDebug() << "Attaching to the global shared memory";
+    } else {
+        qDebug() << "Failed to attach to the global shared memory, giving up. Error:"
+                 << globalMemory.error();
+        return;
+    }
+
+    processEvents();
+}
+
+IPC::~IPC()
+{
+    if (!globalMemory.lock()) {
+        qWarning() << "Failed to lock in ~IPC";
+        return;
+    }
+
+    if (isCurrentOwnerNoLock()) {
+        global()->globalId = 0;
+    }
+    globalMemory.unlock();
+}
+
+time_t IPC::postEvent(const QString& name, const QByteArray& data, uint32_t dest)
+{
+    QByteArray binName = name.toUtf8();
+    if (binName.length() > (int32_t)sizeof(IPCEvent::name)) {
+        return 0;
+    }
+
+    if (data.length() > (int32_t)sizeof(IPCEvent::data)) {
+        return 0;
+    }
+
+    if (!globalMemory.lock()) {
+        qDebug() << "Failed to lock in postEvent()";
+        return 0;
+    }
+
+    IPCEvent* evt = nullptr;
+    IPCMemory* mem = global();
+    time_t result = 0;
+
+    for (uint32_t i = 0; !evt && i < EVENT_QUEUE_SIZE; ++i) {
+        if (mem->events[i].posted == 0) {
+            evt = &mem->events[i];
+        }
+    }
+
+    if (evt) {
+        memset(evt, 0, sizeof(IPCEvent));
+        memcpy(evt->name, binName.constData(), binName.length());
+        memcpy(evt->data, data.constData(), data.length());
+        mem->lastEvent = evt->posted = result = qMax(mem->lastEvent + 1, time(nullptr));
+        evt->dest = dest;
+        evt->sender = qApp->applicationPid();
+        qDebug() << "postEvent " << name << "to" << dest;
+    }
+    globalMemory.unlock();
+    return result;
+}
+
+bool IPC::isCurrentOwner()
+{
+    if (globalMemory.lock()) {
+        const bool isOwner = isCurrentOwnerNoLock();
+        globalMemory.unlock();
+        return isOwner;
+    } else {
+        qWarning() << "isCurrentOwner failed to lock, returning false";
+        return false;
+    }
+}
+
+void IPC::registerEventHandler(const QString& name, IPCEventHandler handler)
+{
+    eventHandlers[name] = handler;
+}
+
+bool IPC::isEventAccepted(time_t time)
+{
+    bool result = false;
+    if (!globalMemory.lock()) {
+        return result;
+    }
+
+    if (difftime(global()->lastProcessed, time) > 0) {
+        IPCMemory* mem = global();
+        for (uint32_t i = 0; i < EVENT_QUEUE_SIZE; ++i) {
+            if (mem->events[i].posted == time && mem->events[i].processed) {
+                result = mem->events[i].accepted;
+                break;
+            }
+        }
+    }
+    globalMemory.unlock();
+
+    return result;
+}
+
+bool IPC::waitUntilAccepted(time_t postTime, int32_t timeout /*=-1*/)
+{
+    bool result = false;
+    time_t start = time(nullptr);
+    forever
+    {
+        result = isEventAccepted(postTime);
+        if (result || (timeout > 0 && difftime(time(nullptr), start) >= timeout)) {
+            break;
+        }
+
+        qApp->processEvents();
+        QThread::msleep(0);
+    }
+    return result;
+}
+
+bool IPC::isAttached() const
+{
+    return globalMemory.isAttached();
+}
+
+void IPC::setProfileId(uint32_t profileId)
+{
+    this->profileId = profileId;
+}
+
+IPC::IPCEvent* IPC::fetchEvent()
+{
+    IPCMemory* mem = global();
+    for (uint32_t i = 0; i < EVENT_QUEUE_SIZE; ++i) {
+        IPCEvent* evt = &mem->events[i];
+        if ((evt->processed && difftime(time(nullptr), evt->processed) > EVENT_GC_TIMEOUT)
+            || (!evt->processed && difftime(time(nullptr), evt->posted) > EVENT_GC_TIMEOUT)) {
+            memset(evt, 0, sizeof(IPCEvent));
+        }
+
+        if (evt->posted && !evt->processed && evt->sender != qApp->applicationPid()
+            && (evt->dest == profileId || (evt->dest == 0 && isCurrentOwnerNoLock()))) {
+            return evt;
+        }
+    }
+
+    return nullptr;
+}
+
+bool IPC::runEventHandler(IPCEventHandler handler, const QByteArray& arg)
+{
+    bool result = false;
+    if (QThread::currentThread() == qApp->thread()) {
+        result = handler(arg);
+    } else {
+        QMetaObject::invokeMethod(this, "runEventHandler", Qt::BlockingQueuedConnection,
+                                  Q_RETURN_ARG(bool, result), Q_ARG(IPCEventHandler, handler),
+                                  Q_ARG(const QByteArray&, arg));
+    }
+    return result;
+}
+
+void IPC::processEvents()
+{
+    if (!globalMemory.lock()) {
+        timer.start();
+        return;
+    }
+
+    IPCMemory* mem = global();
+
+    if (mem->globalId == globalId) {
+        mem->lastProcessed = time(nullptr);
+    } else {
+        if (difftime(time(nullptr), mem->lastProcessed) >= OWNERSHIP_TIMEOUT_S) {
+            qDebug() << "Previous owner timed out, taking ownership" << mem->globalId << "->"
+                     << globalId;
+            memset(mem, 0, sizeof(IPCMemory));
+            mem->globalId = globalId;
+            mem->lastProcessed = time(nullptr);
+        }
+    }
+
+    while (IPCEvent* evt = fetchEvent()) {
+        QString name = QString::fromUtf8(evt->name);
+        auto it = eventHandlers.find(name);
+        if (it != eventHandlers.end()) {
+            evt->accepted = runEventHandler(it.value(), evt->data);
+            qDebug() << "Processed event:" << name << "posted:" << evt->posted
+                     << "accepted:" << evt->accepted;
+            if (evt->dest == 0) {
+                if (evt->accepted) {
+                    evt->processed = time(nullptr);
+                }
+            } else {
+                evt->processed = time(nullptr);
+            }
+        } else {
+            qDebug() << "Received event:" << name << "without handler";
+            qDebug() << "Available handlers:" << eventHandlers.keys();
+        }
+    }
+
+    globalMemory.unlock();
+    timer.start();
+}
+
+bool IPC::isCurrentOwnerNoLock()
+{
+    const void* const data = globalMemory.data();
+    if (!data) {
+        qWarning() << "isCurrentOwnerNoLock failed to access the memory, returning false";
+        return false;
+    }
+    return (*static_cast<const uint64_t*>(data) == globalId);
+}
+
+IPC::IPCMemory* IPC::global()
+{
+    return static_cast<IPCMemory*>(globalMemory.data());
+}

example/src/tool/IPC.h

@@ -0,0 +1,75 @@
+#ifndef IPC_H
+#define IPC_H
+
+#include <QMap>
+#include <QObject>
+#include <QSharedMemory>
+#include <QTimer>
+#include <ctime>
+#include <functional>
+
+using IPCEventHandler = std::function<bool(const QByteArray&)>;
+
+#define IPC_PROTOCOL_VERSION "1"
+
+class IPC : public QObject
+{
+    Q_OBJECT
+
+protected:
+    static const int EVENT_TIMER_MS = 1000;
+    static const int EVENT_GC_TIMEOUT = 5;
+    static const int EVENT_QUEUE_SIZE = 32;
+    static const int OWNERSHIP_TIMEOUT_S = 5;
+
+public:
+    IPC(uint32_t profileId);
+    ~IPC();
+
+    struct IPCEvent
+    {
+        uint32_t dest;
+        int32_t sender;
+        char name[16];
+        char data[128];
+        time_t posted;
+        time_t processed;
+        uint32_t flags;
+        bool accepted;
+        bool global;
+    };
+
+    struct IPCMemory
+    {
+        uint64_t globalId;
+        time_t lastEvent;
+        time_t lastProcessed;
+        IPCEvent events[IPC::EVENT_QUEUE_SIZE];
+    };
+
+    time_t postEvent(const QString& name, const QByteArray& data = QByteArray(), uint32_t dest = 0);
+    bool isCurrentOwner();
+    void registerEventHandler(const QString& name, IPCEventHandler handler);
+    bool isEventAccepted(time_t time);
+    bool waitUntilAccepted(time_t time, int32_t timeout = -1);
+    bool isAttached() const;
+
+public slots:
+    void setProfileId(uint32_t profileId);
+
+private:
+    IPCMemory* global();
+    bool runEventHandler(IPCEventHandler handler, const QByteArray& arg);
+    IPCEvent* fetchEvent();
+    void processEvents();
+    bool isCurrentOwnerNoLock();
+
+private:
+    QTimer timer;
+    uint64_t globalId;
+    uint32_t profileId;
+    QSharedMemory globalMemory;
+    QMap<QString, IPCEventHandler> eventHandlers;
+};
+
+#endif // IPC_H

src/CMakeLists.txt

@@ -45,7 +45,7 @@ set(TARGET_HEADERS
 )
 
 add_definitions(-DVERSION_IN="1.0.0")
-add_definitions(-DVURI_STR="FluentUI")
+add_definitions(-DURI_STR="FluentUI")
 
 add_library(${PROJECT_NAME} ${TARGET_TYPE} ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESOURCES})
 

src/FluApp.cpp

@@ -11,6 +11,8 @@
 #include "Def.h"
 
 #ifdef Q_OS_WIN
+#pragma comment(lib, "Dwmapi.lib")
+#pragma comment(lib, "User32.lib")
 #include <dwmapi.h>
 #include <Windows.h>
 #include <windowsx.h>

src/Fluent.cpp

@@ -34,6 +34,7 @@ void Fluent::registerTypes(const char *uri){
     qmlRegisterType<WindowHelper>(uri,major,minor,"WindowHelper");
     qmlRegisterType<FluColorSet>(uri,major,minor,"FluColorSet");
 
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluBreadcrumbBar.qml"),uri,major,minor,"FluBreadcrumbBar");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluRatingControl.qml"),uri,major,minor,"FluRatingControl");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluStatusView.qml"),uri,major,minor,"FluStatusView");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPagination.qml"),uri,major,minor,"FluPagination");

src/FluentUI.cpp

@@ -8,3 +8,8 @@ void FluentUI::registerTypes(const char *uri){
 void FluentUI::initializeEngine(QQmlEngine *engine, const char *uri){
     Fluent::getInstance()->initializeEngine(engine,uri);
 }
+
+void FluentUI::initialize(QQmlEngine *engine){
+    Fluent::getInstance()->registerTypes(URI_STR);
+    Fluent::getInstance()->initializeEngine(engine,URI_STR);
+}

src/FluentUI.h

@@ -3,12 +3,13 @@
 
 #include <QQmlEngine>
 
-class FluentUI
+class Q_DECL_EXPORT FluentUI
 {
 
 public:
     static void registerTypes(const char *uri) ;
     static void initializeEngine(QQmlEngine *engine, const char *uri);
+    static void initialize(QQmlEngine *engine);
 };
 
 #endif // FLUENTUI_H

src/NativeEventFilter.cpp

@@ -2,6 +2,8 @@
 #include "FluTheme.h"
 #include "FluApp.h"
 #ifdef Q_OS_WIN
+#pragma comment(lib, "Dwmapi.lib")
+#pragma comment(lib, "User32.lib")
 #include <Windows.h>
 #include <windowsx.h>
 #endif
@@ -13,6 +15,9 @@ bool NativeEventFilter::nativeEventFilter(const QByteArray &eventType, void *mes
         MSG* msg = static_cast<MSG *>(message);
         if (msg == Q_NULLPTR)
             return false;
+        if(!FluApp::getInstance()->wnds.contains((WId)msg->hwnd)){
+            return false;
+        }
         switch(msg->message) {
         case WM_NCCALCSIZE:{
             NCCALCSIZE_PARAMS& params = *reinterpret_cast<NCCALCSIZE_PARAMS*>(msg->lParam);

src/WindowHelper.cpp

@@ -5,6 +5,8 @@
 #include "FluTheme.h"
 
 #ifdef Q_OS_WIN
+#pragma comment(lib, "Dwmapi.lib")
+#pragma comment(lib, "User32.lib")
 #include <dwmapi.h>
 #include <Windows.h>
 #include <windowsx.h>

src/controls/FluAppBar.qml

@@ -19,8 +19,6 @@ Rectangle{
     property color maximizeHoverColor: FluTheme.dark ? Qt.rgba(1,1,1,0.1) : Qt.rgba(0,0,0,0.06)
     property color closeNormalColor: Qt.rgba(0,0,0,0)
     property color closeHoverColor:  Qt.rgba(251/255,115/255,115/255,1)
-
-
     property bool showDark: false
     property color borerlessColor : FluTheme.dark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark
 

src/controls/FluArea.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Controls
+import QtQuick.Window
 import FluentUI
 
 Rectangle {
@@ -12,12 +13,24 @@ Rectangle {
     property int bottomPadding : 0
 
     radius: 4
-    color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
+    color: FluTheme.dark ? Window.active ?  Qt.rgba(38/255,44/255,54/255,1) : Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
-    border.color: FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
+    border.color: FluTheme.dark ? Window.active ? Qt.rgba(55/255,55/255,55/255,1):Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
     border.width: 1
     implicitHeight: height
     implicitWidth: width
 
+    Behavior on color{
+        ColorAnimation {
+            duration: 300
+        }
+    }
+
+    Behavior on border.color{
+        ColorAnimation {
+            duration: 300
+        }
+    }
+
     Item {
         id: container
         anchors.fill: parent

src/controls/FluAutoSuggestBox.qml

@@ -3,20 +3,25 @@ import QtQuick.Controls
 import FluentUI
 
 FluTextBox{
+
     property var items:[]
     property string emptyText: "没有找到结果"
     property int autoSuggestBoxReplacement: FluentIcons.Search
     signal itemClicked(var data)
     signal handleClicked
+
+    id:control
+    width: 300
+
+    Component.onCompleted: {
+        loadData()
+    }
+
     QtObject{
         id:d
         property bool flagVisible: true
     }
-    id:control
+
-    width: 300
-    Component.onCompleted: {
-        loadData()
-    }
     Popup{
         id:control_popup
         y:control.height
@@ -121,14 +126,6 @@ FluTextBox{
             control_popup.visible = true
         }
     }
-    TapHandler {
-        acceptedButtons: Qt.RightButton
-        onTapped: control.echoMode !== TextInput.Password && menu.popup()
-    }
-    FluTextBoxMenu{
-        id:menu
-        inputItem: control
-    }
 
     function handleClick(modelData){
         control_popup.visible = false

src/controls/FluBreadcrumbBar.qml

@@ -0,0 +1,100 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import FluentUI
+
+Item {
+
+    property int textSize: 15
+    property string separator: "/"
+    property var items: []
+    property int spacing: 5
+    signal clickItem(var model)
+
+    id:control
+    implicitWidth: 300
+    height: 30
+
+    onItemsChanged: {
+        list_model.clear()
+        list_model.append(items)
+    }
+
+    ListModel{
+        id:list_model
+    }
+
+    ListView{
+        id:list_view
+        width: parent.width
+        height: 30
+        orientation: ListView.Horizontal
+        model: list_model
+        clip: true
+        spacing : control.spacing
+        boundsBehavior: ListView.StopAtBounds
+        remove: Transition {
+            NumberAnimation {
+                properties: "opacity"
+                from: 1
+                to: 0
+                duration: 83
+            }
+        }
+        add: Transition {
+            NumberAnimation {
+                properties: "opacity"
+                from: 0
+                to: 1
+                duration: 83
+            }
+        }
+        delegate: Item{
+            height: item_layout.height
+            width: item_layout.width
+            RowLayout{
+                id:item_layout
+                spacing: list_view.spacing
+                height: list_view.height
+
+                FluText{
+                    text:model.title
+                    Layout.alignment: Qt.AlignVCenter
+                    color: {
+                        if(item_mouse.pressed){
+                            return FluTheme.dark ? Qt.rgba(150/255,150/255,150/235,1) : Qt.rgba(134/255,134/255,134/235,1)
+                        }
+                        if(item_mouse.containsMouse){
+                            return FluTheme.dark ? Qt.rgba(204/255,204/255,204/235,1) : Qt.rgba(92/255,92/255,92/235,1)
+                        }
+                        return FluTheme.dark ? Qt.rgba(255/255,255/255,255/235,1) :  Qt.rgba(26/255,26/255,26/235,1)
+                    }
+                    MouseArea{
+                        id:item_mouse
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        onClicked: {
+                            control.clickItem(model)
+                        }
+                    }
+                }
+
+                FluText{
+                    text:control.separator
+                    font.pixelSize:  control.textSize
+                    visible: list_view.count-1 !== index
+                    Layout.alignment: Qt.AlignVCenter
+                }
+            }
+        }
+    }
+
+    function remove(index,count){
+        list_model.remove(index,count)
+    }
+
+    function count(){
+        return list_model.count
+    }
+
+}

src/controls/FluButton.qml

@@ -17,7 +17,6 @@ Button {
     rightPadding:15
     enabled: !disabled
     focusPolicy:Qt.TabFocus
-
     Keys.onSpacePressed: control.visualFocus&&clicked()
 
     background: Rectangle{

src/controls/FluCarousel.qml

@@ -12,9 +12,11 @@ Item {
     id:control
     width: 400
     height: 300
+
     ListModel{
         id:content_model
     }
+
     FluRectangle{
         anchors.fill: parent
         radius: [control.radius,control.radius,control.radius,control.radius]
@@ -105,9 +107,6 @@ Item {
                         return false
                     return true
                 }
-                layer.samples: 4
-                layer.enabled: true
-                layer.smooth: true
                 border.width: 1
                 border.color: FluColors.Grey100
                 color:   list_view.currentIndex === index ?  FluTheme.primaryColor.dark : Qt.rgba(1,1,1,0.5)

src/controls/FluContentDialog.qml

@@ -29,6 +29,28 @@ Popup {
     anchors.centerIn: Overlay.overlay
     closePolicy: Popup.CloseOnEscape
     background:Item{}
+
+    enter: Transition {
+        reversible: true
+        NumberAnimation {
+            properties: "opacity,scale"
+            from:0
+            to:1
+            duration: 167
+            easing.type: Easing.BezierSpline
+            easing.bezierCurve: [ 0, 0, 0, 1 ]
+        }
+    }
+    exit:Transition {
+        NumberAnimation {
+            properties: "opacity,scale"
+            from:1
+            to:0
+            duration: 167
+            easing.type: Easing.BezierSpline
+            easing.bezierCurve: [ 1, 0, 0, 0 ]
+        }
+    }
     contentItem: Rectangle {
         id:layout_content
         implicitWidth:minWidth

src/controls/FluDatePicker.qml

@@ -14,7 +14,6 @@ Rectangle {
     property bool changeFlag: true
     readonly property var rowData: ["","",""]
 
-
     id:root
     color: {
         if(mouse_area.containsMouse){

src/controls/FluDivider.qml

@@ -1,9 +1,10 @@
 import QtQuick
+import QtQuick.Window
 import FluentUI
 
 Rectangle {
 
-    color: FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,230/255,234/255,1)
+    color: FluTheme.dark ? Window.active ? Qt.rgba(55/255,55/255,55/255,1):Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,230/255,234/255,1)
 
     Behavior on color{
         ColorAnimation {

src/controls/FluDropDownButton.qml

@@ -91,7 +91,6 @@ Button {
     FluMenu{
         id:menu
         width: control.width
-        animEnabled: true
     }
 
 }

src/controls/FluExpander.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Controls
+import QtQuick.Window
 import FluentUI
 
 Item {
@@ -20,8 +21,20 @@ Item {
         width: parent.width
         height: 45
         radius: 4
-        color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
+        color: FluTheme.dark ? Window.active ? Qt.rgba(38/255,44/255,54/255,1) : Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
-        border.color: FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
+        border.color: FluTheme.dark ?  Window.active ? Qt.rgba(55/255,55/255,55/255,1) : Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
+
+        Behavior on color{
+            ColorAnimation {
+                duration: 300
+            }
+        }
+
+        Behavior on border.color{
+            ColorAnimation {
+                duration: 300
+            }
+        }
 
         MouseArea{
             id:root_mouse

src/controls/FluFocusRectangle.qml

@@ -8,7 +8,6 @@ Item {
     id:root
     anchors.fill: parent
     anchors.margins: -3
-
     Rectangle{
         width: root.width
         height: root.height

src/controls/FluIconButton.qml

@@ -39,7 +39,6 @@ Button {
     id:control
     width: 30
     height: 30
-    clip: true
     implicitWidth: width
     implicitHeight: height
     padding: 0

src/controls/FluMenu.qml

@@ -5,7 +5,7 @@ import QtQuick.Controls
 Menu {
 
     default property alias content: container.data
-    property bool animEnabled: false
+    property bool enableAnimation: true
     id: popup
     width: 140
     height: container.height
@@ -17,7 +17,7 @@ Menu {
             property: "opacity"
             from:0
             to:1
-            duration: 83
+            duration: enableAnimation ? 83 : 0
         }
     }
 
@@ -26,7 +26,7 @@ Menu {
             property: "opacity"
             from:1
             to:0
-            duration: 83
+            duration: enableAnimation ? 83 : 0
         }
     }
 
@@ -39,7 +39,9 @@ Menu {
         clip: true
         Rectangle{
             anchors.fill: parent
-            color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,0.97) : Qt.rgba(237/255,237/255,237/255,0.97)
+            color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(249/255,249/255,249/255,1)
+            border.color: FluTheme.dark ? Window.active ? Qt.rgba(55/255,55/255,55/255,1):Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
+            border.width: 1
             radius: 5
         }
         Column{

src/controls/FluMenuItem.qml

@@ -4,12 +4,13 @@ import QtQuick.Controls
 Item {
 
     property string text: "MenuItem"
+    property var onClickFunc
     signal clicked
 
-    id:root
+    id:control
     width: {
-        if(root.parent){
+        if(control.parent){
-            return root.parent.width
+            return control.parent.width
         }
         return 140
     }
@@ -18,7 +19,7 @@ Item {
 
     Rectangle{
         anchors.centerIn: parent
-        width: root.width-40
+        width: control.width-40
         height: 32
         radius: 4
         color:{
@@ -36,7 +37,7 @@ Item {
         }
 
         FluText{
-            text: root.text
+            text: control.text
             anchors.centerIn: parent
         }
 
@@ -45,8 +46,12 @@ Item {
             hoverEnabled: true
             anchors.fill: parent
             onClicked: {
-                root.clicked()
+                if(control.onClickFunc){
-                root.parent.closePopup()
+                    control.onClickFunc()
+                    return
+                }
+                control.parent.closePopup()
+                control.clicked()
             }
         }
     }

src/controls/FluNavigationView.qml

@@ -509,6 +509,7 @@ Item {
                 onClicked: {
                     d.enableNavigationPanel = !d.enableNavigationPanel
                 }
+                visible: Layout.preferredWidth !== 0
                 Behavior on Layout.preferredWidth{
                     NumberAnimation{
                         duration: 167
@@ -620,7 +621,7 @@ Item {
                 return FluTheme.dark ? Qt.rgba(61/255,61/255,61/255,1) : Qt.rgba(243/255,243/255,243/255,1)
             }
             if(window && window.active){
-                return FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(238/255,244/255,249/255,1)
+                return FluTheme.dark ? Qt.rgba(26/255,34/255,41/255,1) : Qt.rgba(238/255,244/255,249/255,1)
             }
             return FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
         }
@@ -639,7 +640,7 @@ Item {
             width: layout_list.width
             clip: true
             y:nav_app_bar.height
-            height: 38
+            height: autoSuggestBox ? 38 : 0
             Loader{
                 id:loader_auto_suggest_box
                 anchors.centerIn: parent

src/controls/FluPivot.qml

@@ -4,13 +4,12 @@ import FluentUI
 
 Item {
 
-
-    id:control
     default property alias content: d.children
     property alias currentIndex: nav_list.currentIndex
     property color normalColor: FluTheme.dark ? FluColors.Grey120 : FluColors.Grey120
     property color hoverColor: FluTheme.dark ? FluColors.Grey10 : FluColors.Black
 
+    id:control
     width: 400
     height: 300
     implicitHeight: height

src/controls/FluProgressBar.qml

@@ -11,7 +11,7 @@ FluRectangle {
     height: 5
     radius: [3,3,3,3]
     clip: true
-    color:  FluTheme.dark ? Qt.rgba(41/255,41/255,41/255,1) : Qt.rgba(214/255,214/255,214/255,1)
+    color:  FluTheme.dark ? Qt.rgba(99/255,99/255,99/255,1) : Qt.rgba(214/255,214/255,214/255,1)
 
     Component.onCompleted: {
         if(indeterminate){

src/controls/FluProgressRing.qml

@@ -15,7 +15,7 @@ Rectangle {
     radius: 22
     border.width: linWidth
     color: "#00000000"
-    border.color: FluTheme.dark ? Qt.rgba(41/255,41/255,41/255,1) : Qt.rgba(214/255,214/255,214/255,1)
+    border.color: FluTheme.dark ? Qt.rgba(99/255,99/255,99/255,1) : Qt.rgba(214/255,214/255,214/255,1)
 
     onProgressChanged: {
         canvas.requestPaint()

src/controls/FluRadioButton.qml

@@ -25,9 +25,6 @@ Button {
             width: 20
             height: 20
             radius: 10
-            layer.samples: 4
-            layer.enabled: true
-            layer.smooth: true
             border.width: {
                 if(selected&&disabled){
                     return 3

src/controls/FluRectangle.qml

@@ -3,12 +3,13 @@ import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
 
 Item{
-    id:control
+
     property var radius:[0,0,0,0]
     property color color : "#FFFFFF"
     property bool shadow: true
     default property alias contentItem: container.data
 
+    id:control
     FluShadow{
         anchors.fill: container
         radius: control.radius[0]

src/controls/FluScrollBar.qml

@@ -3,13 +3,13 @@ import QtQuick.Controls
 import FluentUI
 
 ScrollBar {
-    id: control
 
     property color handleNormalColor: Qt.rgba(134/255,134/255,134/255,1)
     property color handleHoverColor: Qt.lighter(handleNormalColor)
     property color handlePressColor: Qt.darker(handleNormalColor)
     property bool expand: false
 
+    id: control
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
                             implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
@@ -90,9 +90,6 @@ ScrollBar {
         implicitWidth: expand ? 8 : 2
         implicitHeight:  expand ? 8 : 2
         radius: width / 2
-        layer.samples: 4
-        layer.enabled: true
-        layer.smooth: true
         color: control.pressed?handlePressColor:control.hovered?handleHoverColor:handleNormalColor
         opacity:(control.policy === ScrollBar.AlwaysOn || control.size < 1.0)?1.0:0.0
     }

src/controls/FluTabView.qml

@@ -5,21 +5,6 @@ import FluentUI
 
 Item {
 
-    id:control
-    anchors.fill: {
-        if(parent)
-            return parent
-        return undefined
-    }
-
-    implicitHeight: height
-    implicitWidth: width
-
-    MouseArea{
-        anchors.fill: parent
-        preventStealing: true
-    }
-
     enum TabWidthBehavior {
         Equal,
         SizeToContent,
@@ -35,8 +20,18 @@ Item {
     property int tabWidthBehavior : FluTabView.Equal
     property int closeButtonVisibility : FluTabView.Always
     property int itemWidth: 146
+    property bool addButtonVisibility: true
     signal newPressed
 
+    id:control
+    implicitHeight: height
+    implicitWidth: width
+    anchors.fill: {
+        if(parent)
+            return parent
+        return undefined
+    }
+
     QtObject {
         id: d
         property int dragIndex: -1
@@ -45,12 +40,18 @@ Item {
         property int maxEqualWidth: 240
     }
 
+    MouseArea{
+        anchors.fill: parent
+        preventStealing: true
+    }
+
     ListModel{
         id:tab_model
     }
 
     FluIconButton{
         id:btn_new
+        visible: addButtonVisibility
         width: 34
         height: 34
         x:Math.min(tab_nav.contentWidth,tab_nav.width)

src/controls/FluTableView.qml

@@ -5,7 +5,6 @@ import FluentUI
 
 Item {
 
-    id:control
     property var columns : []
     property var dataSource : []
     property int pageCurrent: 1
@@ -14,6 +13,7 @@ Item {
     property int itemHeight: 56
     signal requestPage(int page,int count)
 
+    id:control
     implicitHeight: layout_coumns.height + layout_table.height
 
     MouseArea{

src/controls/FluText.qml

@@ -3,10 +3,6 @@ import FluentUI
 
 Text {
 
-    property int fontStyle: FluText.Body
-    property color textColor: FluTheme.dark ? FluColors.White : FluColors.Grey220
-    property int pixelSize : FluTheme.textSize
-
     enum FontStyle {
         Display,
         TitleLarge,
@@ -17,6 +13,10 @@ Text {
         Caption
     }
 
+    property int fontStyle: FluText.Body
+    property color textColor: FluTheme.dark ? FluColors.White : FluColors.Grey220
+    property int pixelSize : FluTheme.textSize
+
     id:text
     color: textColor
     renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering

src/controls/FluTextBoxBackground.qml

@@ -2,10 +2,10 @@
 import Qt5Compat.GraphicalEffects
 
 Rectangle{
-    id:content
 
     property Item inputItem
 
+    id:content
     radius: 4
     layer.enabled: true
     color: {
@@ -48,7 +48,9 @@ Rectangle{
         }
         Behavior on height{
             NumberAnimation{
-                duration: 200
+                duration: 167
+                easing.type: Easing.BezierSpline
+                easing.bezierCurve: [ 1, 0, 0, 0 ]
             }
         }
     }

src/controls/FluTextBoxMenu.qml

@@ -1,21 +1,34 @@
 import QtQuick
+import QtQuick.Controls
 import FluentUI
 
 FluMenu{
+
     property string cutText : "剪切"
     property string copyText : "复制"
     property string pasteText : "粘贴"
     property string selectAllText : "全选"
     property var inputItem
+
     id:menu
-    focus: false
+    focus:false
+    enableAnimation:false
+
+    Connections{
+        target: inputItem
+        function onTextChanged() {
+            menu.close()
+        }
+    }
+
     FluMenuItem{
         text: cutText
-        visible: inputItem.text !== "" && !inputItem.readOnly
+        visible: inputItem.selectedText !== "" && !inputItem.readOnly
         onClicked: {
             inputItem.cut()
         }
     }
+
     FluMenuItem{
         text: copyText
         visible: inputItem.selectedText !== ""