update

2025-07-01 15:14:36 +08:00 · 2023-05-19 13:50:06 +08:00 · 2023-05-19 09:19:52 +08:00 · 2023-05-19 08:03:37 +08:00 · 2023-05-19 07:57:23 +08:00 · 2023-05-18 23:33:31 +08:00
267 changed files with 1878 additions and 2000 deletions
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@ -50,7 +50,7 @@ jobs:
          cmake --version
          mkdir build
          cd build
-          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
+          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/Users/runner/work/FluentUI/Qt/6.4.3/macos -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
          cmake --build . --target all --config Release --parallel
          
      - name: package
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@ -47,7 +47,7 @@ jobs:
          version: 1.10.2
          
      - name: ubuntu install GL library
-        run: sudo apt-get install -y libxkbcommon-x11-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxcb-xinerama0-dev libxcb-sync-dev  libxcb-render-util0-dev libxcb-shm0-dev
+        run: sudo apt-get install -y libgl1-mesa-dev libxcb1-dev libgtk-3-dev libxkbcommon-x11-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxcb-xinerama0-dev libxcb-sync-dev  libxcb-render-util0-dev libxcb-shm0-dev
        
      - name: build ubuntu
        run: |
@ -55,7 +55,7 @@ jobs:
          cmake --version
          mkdir build
          cd build
-          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
+          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/home/runner/work/FluentUI/Qt/6.4.3/gcc_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
          cmake --build . --target all --config Release --parallel
          
      - name: install QT linux deploy
--- a/.github/workflows/windows-mingw.yml
+++ b/.github/workflows/windows-mingw.yml
@ -62,7 +62,7 @@ jobs:
        run: |
          mkdir build
          cd build
-          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
+          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\6.4.3\mingw_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
          cmake --build . --target all --config Release --parallel
      
      - name: package
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@ -51,7 +51,7 @@ jobs:
          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.msvc_arch }}
          mkdir build
          cd build
-          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DCMAKE_BUILD_TYPE=Release -GNinja ..
+          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\6.4.3\msvc2019_64 -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DCMAKE_BUILD_TYPE=Release -GNinja ..
          cmake --build . --target all --config Release --parallel
          echo winSdkDir=%WindowsSdkDir% >> %GITHUB_ENV%
          echo winSdkVer=%WindowsSdkVersion% >> %GITHUB_ENV%
--- a/.gitignore
+++ b/.gitignore
@ -34,4 +34,6 @@ CMakeLists.txt.user*
 src/build-preset/plugins.qmltypes
 bin
 .DS_Store
-build
+build
+cmake-build-*
+.idea
--- a/.gitmodules
+++ b/.gitmodules
@ -0,0 +1,3 @@
+[submodule "framelesshelper"]
+	path = framelesshelper
+	url = https://github.com/zhuzichu520/framelesshelper.git
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
+
 project(FluentUI VERSION 0.1 LANGUAGES CXX)

 add_subdirectory(src)
 add_subdirectory(example)
+add_subdirectory(framelesshelper)
--- a/README.md
+++ b/README.md
@ -1,99 +1,119 @@
-# FluentUI
+<div align=center>
+  <img width=64 src="doc/preview/fluent_design.svg">
+</div>

-## 简介
+<h1 align="center">
+  QML FluentUI 
+</h1>
+<p align="center">
+  A fluent design component library for Qt QML
+</p>

-这是一个漂亮的Fluent组件库，使用QML插件开发的。main分支是Qt6.4.3，如果需要qt5的请切换至qt5分支，<a href="https://github.com/zhuzichu520/FluentUI/wiki/%E6%96%B0%E6%89%8B%E5%85%A5%E9%97%A8" target="_blank">如何使用？</a>
+![win-badge] ![ubuntu-badge] ![macos-badge] ![release-badge] ![download-badge] ![download-latest]
+
+<p align="center">
+English | <a href="README_zh_CN.md">简体中文</a>
+</p>
+<div align=center>
+  <img src="doc/preview/demo_large.png">
+</div>

-## 编译状态
-| [Windows][win-link]| [Ubuntu][ubuntu-link]|[MacOS][macos-link]|
-|---------------|---------------|-----------------|
-| ![win-badge]  | ![ubuntu-badge]      | ![macos-badge] |

 [win-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AWindows "WindowsAction"
 [win-badge]: https://github.com/zhuzichu520/FluentUI/workflows/Windows/badge.svg  "Windows"
-
 [ubuntu-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AUbuntu "UbuntuAction"
 [ubuntu-badge]: https://github.com/zhuzichu520/FluentUI/workflows/Ubuntu/badge.svg "Ubuntu"
-
 [macos-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AMacOS "MacOSAction"
 [macos-badge]: https://github.com/zhuzichu520/FluentUI/workflows/MacOS/badge.svg "MacOS"
-
-## 发布
-
-|[已发布][release-link]|[下载][download-link]|下载次数|
-|:--:|:--:|:--:|
-|![release-badge] |![download-badge]|![download-latest]|
-
 [release-link]: https://github.com/zhuzichu520/FluentUI/releases "Release status"
 [release-badge]: https://img.shields.io/github/release/zhuzichu520/FluentUI.svg?style=flat-square "Release status"
 [download-link]: https://github.com/zhuzichu520/FluentUI/releases/latest "Download status"
 [download-badge]: https://img.shields.io/github/downloads/zhuzichu520/FluentUI/total.svg "Download status"
 [download-latest]: https://img.shields.io/github/downloads/zhuzichu520/FluentUI/latest/total.svg "latest status"

-## 支持的组件

-|目录|说明|备注|
-|----|----|----|
-|FluApp|初始化入口|支持路由跳转|
-|FluWindow|无边框窗口|解决windows拖动闪烁问题|
-|FluAppBar|窗口顶部标题栏|支持拖动窗口，最小化、最大化、关闭窗口|
-|FluText|Text文本||
-|FluButton|按钮||
-|FluFilledButton|实心按钮||
-|FluIconButton|图标按钮||
-|FluTextButton|文本按钮||
-|FluIcon|图标||
-|FluRadioButton|单选按钮||
-|FluTextBox|单行输入框||
-|FluMultiLineTextBox|多行输入框||
-|FluToggleSwitch|开关按钮||
-|FluSlider|拖动条||
-|FluInfoBar|提示Toast||
-|FluContentDialog|对话框||
-|FluProgressBar|条形进度条||
-|FluProgressRing|圆形进度条||
-|FluRectangle|矩形|支持部分圆角、clip|
-|FluMenu|菜单框||
-|FluTooltip|tooltip提示框||
-|FluTreeView|树控件||
-|FluTheme|主题设置|支持主题颜色切换，夜间模式|
-|FluCarousel|轮播图组件|支持无限轮播|
-|FluTimePicker|时间选择器||
-|FluDatePicker|日期选择器||
-|FluMenu|菜单Popup||
-|FluNavigationView|响应式导航布局||
-|FluScrollbar|滚动条||
-|FluToggleButton|开关按钮||
-|FluPagination|分页组件||
-|FluTableView|表格组件||
-|FluMediaPlayer|播放器||
-|FluFlipView|FlipView||
+<p align=center>
+This is a beautiful FluentUI component library based on Qt QML. Currently the main branch supports Qt 6. If you want to use it in Qt 5, checkout the Qt 5 branch.
+</p>

-# 部分效果预览
+## Requirements

-## 首页
+ Qt Core, Qt Quick, Qt QML, Qt ShaderTool, Qt 5 Compatibility Module. (**Essential**)
+ Qt LinguistTool (optional,for translations)
+ Qt Svg (optional, however essential for Qt 5)

-![](doc/preview/home.png)
+Use [Qt Online Installers](https://download.qt.io/archive/online_installers/) to aquire the moudules (**Recommanded**) or compile them first before using the library.

-## 各种Button按钮
+## ⚽ Get started

-![](doc/preview/buttons.png)
+ Download the [pre-built release](https://github.com/zhuzichu520/FluentUI/releases). (Please pecify your platform and compilers.)

-## 主题颜色切换、夜间模式
+ run `example` program.

-![](doc/preview/theme.png)
+or 

-## TableView表格组件
+ Clone the repository.

-![](doc/preview/tableview.png)
+```SHELL
+git clone --recursive https://github.com/zhuzichu520/FluentUI.git
+```

-## FluTreeView树组件
+ Build

-![](doc/preview/treeview.png)
+```
+git clone --recursive https://github.com/zhuzichu520/FluentUI.git
+cd FluentUI
+mkdir build
+cd build
+cmake -DCMAKE_PREFIX_PATH=<YOUR_QT_SDK_DIR_PATH> -DCMAKE_BUILD_TYPE=Release -GNinja <PATH_TO_THE_REPOSITORY>
+cmake --build . --config Release --target all --parallel
+```

-## 轮播图组件
+ Use your IDE (`Qt Creator` or `CLion`) to open the project. (only **CMake** supported).

-![](doc/preview/carousel.png)
+<div align=center>
+  <img src="doc/preview/qt_creator_project.png">
+</div>

-### ⚡ Visitor count
+ Compile the project. Then try to execute the `example` demo program.
+
+ Great! Now you are ready to write your first QML FluentUI program! Check the documentations for more details.
+
+
+## 📑 Documentations
+
+(Work in progress...🚀)
+
+## Supported components
+
+|Catalog|Detail|Notes / Demos|
+|:----:|:----:|:----:|
+|FluApp|The initial entry of the program|Router supported(SPA)|
+|FluWindow|Frameless Window|*This only works on windows|
+|FluAppBar|Title bar on top of the window|Drag, minimize, maximize and close are supported.|
+|FluText|Common text||
+|FluButton|Common button|![btn](doc/preview/demo_standardbtn.png) |
+|FluFilledButton|Filled button|![filledbtn](doc/preview/demo_filledbtn.png)|
+|FluTextButton|Text button|![textbtn](doc/preview/demo_textbtn.png)|
+|FluToggleButton|Toggle buttons|![togglebtn](doc/preview/demo_toggle_btn.png)|
+|FluIcon|Common icon|![icons](doc/preview/demo_icon.png)|
+|FluRadioButton|radio button|![radiobtn](doc/preview/demo_radiobtn.png)|
+|FluTextBox|Single-line input box|![textbox](doc/preview/demo_textbox.png)|
+|FluMultiLineTextBox|Multi-lines input area|![textarea](doc/preview/demo_multiline_textbox.png)|
+|FluToggleSwitch|toggle switch|![toggleswitch](doc/preview/demo_toggle_switch.png)|
+
+
+View more [`here`](doc/md/all_components.md)!
+
+
+## Reference
+ [**Windows design**: Design guidelines and toolkits of Microsoft.](https://learn.microsoft.com/en-us/windows/apps/design/)
+ [**Microsoft/WinUI-Gallery**: Microsoft's demo](https://github.com/microsoft/WinUI-Gallery)
+
+
+## License
+
+This FluentUI library currently licensed under [MIT License](./License)
+
+## ⚡ Visitor count
 ![](https://profile-counter.glitch.me/zhuzichu520-FluentUI/count.svg)
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@ -0,0 +1,99 @@
+# FluentUI
+
+## 简介
+
+这是一个漂亮的Fluent组件库，使用QML插件开发的。main分支是Qt6.4.3，<a href="https://github.com/zhuzichu520/FluentUI/wiki/%E6%96%B0%E6%89%8B%E5%85%A5%E9%97%A8" target="_blank">如何使用？</a>。如果需要qt5的请切换至qt5分支，<a href="https://github.com/zhuzichu520/FluentUI/wiki/%E6%96%B0%E6%89%8B%E5%85%A5%E9%97%A8%EF%BC%881.2.7%E4%BB%A5%E5%8F%8A%E4%B9%8B%E5%89%8D%E7%89%88%E6%9C%AC%EF%BC%89" target="_blank">如何使用？</a>
+
+## 编译状态
+| [Windows][win-link]| [Ubuntu][ubuntu-link]|[MacOS][macos-link]|
+|---------------|---------------|-----------------|
+| ![win-badge]  | ![ubuntu-badge]      | ![macos-badge] |
+
+[win-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AWindows "WindowsAction"
+[win-badge]: https://github.com/zhuzichu520/FluentUI/workflows/Windows/badge.svg  "Windows"
+
+[ubuntu-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AUbuntu "UbuntuAction"
+[ubuntu-badge]: https://github.com/zhuzichu520/FluentUI/workflows/Ubuntu/badge.svg "Ubuntu"
+
+[macos-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AMacOS "MacOSAction"
+[macos-badge]: https://github.com/zhuzichu520/FluentUI/workflows/MacOS/badge.svg "MacOS"
+
+## 发布
+
+|[已发布][release-link]|[下载][download-link]|下载次数|
+|:--:|:--:|:--:|
+|![release-badge] |![download-badge]|![download-latest]|
+
+[release-link]: https://github.com/zhuzichu520/FluentUI/releases "Release status"
+[release-badge]: https://img.shields.io/github/release/zhuzichu520/FluentUI.svg?style=flat-square "Release status"
+[download-link]: https://github.com/zhuzichu520/FluentUI/releases/latest "Download status"
+[download-badge]: https://img.shields.io/github/downloads/zhuzichu520/FluentUI/total.svg "Download status"
+[download-latest]: https://img.shields.io/github/downloads/zhuzichu520/FluentUI/latest/total.svg "latest status"
+
+## 支持的组件
+
+|目录|说明|备注|
+|----|----|----|
+|FluApp|初始化入口|支持路由跳转|
+|FluWindow|无边框窗口|解决windows拖动闪烁问题|
+|FluAppBar|窗口顶部标题栏|支持拖动窗口，最小化、最大化、关闭窗口|
+|FluText|Text文本||
+|FluButton|按钮||
+|FluFilledButton|实心按钮||
+|FluIconButton|图标按钮||
+|FluTextButton|文本按钮||
+|FluIcon|图标||
+|FluRadioButton|单选按钮||
+|FluTextBox|单行输入框||
+|FluMultiLineTextBox|多行输入框||
+|FluToggleSwitch|开关按钮||
+|FluSlider|拖动条||
+|FluInfoBar|提示Toast||
+|FluContentDialog|对话框||
+|FluProgressBar|条形进度条||
+|FluProgressRing|圆形进度条||
+|FluRectangle|矩形|支持部分圆角、clip|
+|FluMenu|菜单框||
+|FluTooltip|tooltip提示框||
+|FluTreeView|树控件||
+|FluTheme|主题设置|支持主题颜色切换，夜间模式|
+|FluCarousel|轮播图组件|支持无限轮播|
+|FluTimePicker|时间选择器||
+|FluDatePicker|日期选择器||
+|FluMenu|菜单Popup||
+|FluNavigationView|响应式导航布局||
+|FluScrollbar|滚动条||
+|FluToggleButton|开关按钮||
+|FluPagination|分页组件||
+|FluTableView|表格组件||
+|FluMediaPlayer|播放器||
+|FluFlipView|FlipView||
+
+# 部分效果预览
+
+## 首页
+
+![](doc/preview/home.png)
+
+## 各种Button按钮
+
+![](doc/preview/buttons.png)
+
+## 主题颜色切换、夜间模式
+
+![](doc/preview/theme.png)
+
+## TableView表格组件
+
+![](doc/preview/tableview.png)
+
+## FluTreeView树组件
+
+![](doc/preview/treeview.png)
+
+## 轮播图组件
+
+![](doc/preview/carousel.png)
+
+### ⚡ Visitor count
+![](https://profile-counter.glitch.me/zhuzichu520-FluentUI/count.svg)
--- a/doc/md/all_components.md
+++ b/doc/md/all_components.md
@ -0,0 +1,37 @@
+# 支持的组件
+
+|Catalog|Detail|Notes / Demos|
+|:----:|:----:|:----:|
+|FluApp|The initial entry of the program|Router supported(SPA)|
+|FluWindow|Frameless Window|*This only works on windows|
+|FluAppBar|Title bar on top of the window|Drag, minimize, maximize and close are supported.|
+|FluText|Common text||
+|FluButton|Common button|![btn](../preview/demo_standardbtn.png) |
+|FluFilledButton|Filled button|![filledbtn](../preview/demo_filledbtn.png)|
+|FluTextButton|Text button|![textbtn](../preview/demo_textbtn.png)|
+|FluToggleButton|Toggle buttons|![togglebtn](../preview/demo_toggle_btn.png)|
+|FluIcon|fluent icons|![icons](../preview/demo_icon.png)|
+|FluRadioButton|radio button|![radiobtn](../preview/demo_radiobtn.png)|
+|FluTextBox|Single-line input box|![textbox](../preview/demo_textbox.png)|
+|FluMultiLineTextBox|Multi-lines input area|![textarea](../preview/demo_multiline_textbox.png)|
+|FluToggleSwitch|toggle switch|![toggleswitch](../preview/demo_toggle_switch.png)|
+|FluSlider|Slider|![slider](../preview/demo_slider.png)|
+|FluInfoBar|提示Toast|![infobar](../preview/demo_infobar.png)|
+|FluContentDialog| dialog |![dialog](../preview/demo_content_dialog.png)|
+|FluProgressBar| progress bar |![progress](../preview/demo_progress_bar_ring.png)|
+|FluProgressRing|circle progress||
+|FluRectangle|reactangle| ![rect](../preview/demo_rectangle.png)</br>*partially support `round` and `clip` feature|
+|FluMenu|menu||
+|FluTooltip|tooltip|![tooltip](../preview/demo_tooltip.png)|
+|FluTreeView|tree view component|![treeview](../preview/demo_tree_view.png)|
+|FluTheme|theme settings|theme color changes, dark mode are supported|
+|FluCarousel|-||
+|FluTimePicker| time picker ||
+|FluDatePicker|date picker||
+|FluMenu|the menu popup||
+|FluNavigationView|responsive navigation view||
+|FluScrollbar|scroll bar||
+|FluPagination|||
+|FluTableView|table component||
+|FluMediaPlayer|multimedia components||
+|FluFlipView| flip view||
--- a/doc/preview/demo_content_dialog.png
+++ b/doc/preview/demo_content_dialog.png
--- a/doc/preview/demo_filledbtn.png
+++ b/doc/preview/demo_filledbtn.png
--- a/doc/preview/demo_icon.png
+++ b/doc/preview/demo_icon.png
--- a/doc/preview/demo_infobar.png
+++ b/doc/preview/demo_infobar.png
--- a/doc/preview/demo_large.png
+++ b/doc/preview/demo_large.png
--- a/doc/preview/demo_multiline_textbox.png
+++ b/doc/preview/demo_multiline_textbox.png
--- a/doc/preview/demo_progress_bar_ring.png
+++ b/doc/preview/demo_progress_bar_ring.png
--- a/doc/preview/demo_radiobtn.png
+++ b/doc/preview/demo_radiobtn.png
--- a/doc/preview/demo_rectangle.png
+++ b/doc/preview/demo_rectangle.png
--- a/doc/preview/demo_slider.png
+++ b/doc/preview/demo_slider.png
--- a/doc/preview/demo_standardbtn.png
+++ b/doc/preview/demo_standardbtn.png
--- a/doc/preview/demo_textbox.png
+++ b/doc/preview/demo_textbox.png
--- a/doc/preview/demo_textbtn.png
+++ b/doc/preview/demo_textbtn.png
--- a/doc/preview/demo_toggle_btn.png
+++ b/doc/preview/demo_toggle_btn.png
--- a/doc/preview/demo_toggle_switch.png
+++ b/doc/preview/demo_toggle_switch.png
--- a/doc/preview/demo_tooltip.png
+++ b/doc/preview/demo_tooltip.png
--- a/doc/preview/demo_tree_view.png
+++ b/doc/preview/demo_tree_view.png
--- a/doc/preview/fluent_design.svg
+++ b/doc/preview/fluent_design.svg
@ -0,0 +1,7 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 73 73" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#000000" stroke="#000000">
+
+<g id="SVGRepo_bgCarrier" stroke-width="0"/>
+
--- a/doc/preview/qt_creator_project.png
+++ b/doc/preview/qt_creator_project.png
--- a/example.svg
+++ b/example.svg
@ -1 +1,7 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1678260749060" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11227" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M0 0m170.663111 0l682.652445 0q170.663111 0 170.663111 170.663111l0 682.652445q0 170.663111-170.663111 170.663111l-682.652445 0q-170.663111 0-170.663111-170.663111l0-682.652445q0-170.663111 170.663111-170.663111Z" fill="#EBF2FF" p-id="11228"></path><path d="M512.351993 787.674257c182.822858 0 330.926439 98.568613 331.033103 231.312514 0 1.674632-0.031999 3.338597-0.106664 5.002563H181.43622c-0.074665-1.663965-0.106664-3.327931-0.106664-5.002563 0-132.743901 148.210246-231.312514 331.022437-231.312514z" fill="#7D99C8" p-id="11229"></path><path d="M592.264994 721.158309v79.817004h-0.810649c-5.546551 30.079373-38.847191 53.204225-79.102352 53.204225-40.244495 0-73.545134-23.114185-79.091686-53.193559h-0.81065V721.158309h159.815337z" fill="#FBDBCB" p-id="11230"></path><path d="M508.213412 765.626716c-44.105748-1.226641-85.363555-19.306264-118.568196-56.916147-22.826191-25.866128-35.199267-53.054895-37.097894-81.576968l-21.610217-1.610633a59.988084 59.988084 0 0 1-55.433511-56.585488l-0.319994-5.72788a34.932606 34.932606 0 0 1 43.124435-35.839254l0.949314-9.098477a608.008666 608.008666 0 0 1 40.031166-159.015354l10.389117-25.866127H655.026354l10.389117 25.866127a608.008666 608.008666 0 0 1 40.031166 159.015354l0.95998 9.098477a34.932606 34.932606 0 0 1 43.103102 35.839254l-0.309327 5.72788a59.988084 59.988084 0 0 1-55.433512 56.585488l-21.610217 1.610633c-1.909294 28.522072-14.271703 55.710839-37.097893 81.576968-34.239287 38.793858-77.054395 56.798817-122.717444 56.980146z" fill="#FFE7DB" p-id="11231"></path><path d="M546.911273 182.822858a10.666444 10.666444 0 0 1 1.429303 4.31991c0.533322 5.055895 0.714652 9.226474 0.533322 12.501073l-0.202662 2.346618 3.221266-0.543989c21.876878-3.733256 38.452532-9.877128 49.705631-18.452949l2.197288-1.73863a10.666444 10.666444 0 0 1 16.682319 3.98925c8.767817 20.650236 11.125102 40.681819 7.039853 60.116081l-0.373325 1.578633c4.746568 1.514635 9.589134 3.199933 14.506364 5.066562 27.882086 10.581113 57.769463 26.367451 76.883732 75.65709 20.212912 52.084248 18.826274 116.562905-4.149247 193.425304l-1.855961 6.101206H701.425387c-0.47999-51.732256-8.319827-90.526114-23.540843-116.392242-15.221016-25.866128-29.716714-46.185704-43.487094-60.969396-41.513802 10.399783-79.85967 15.914335-115.037603 16.564988l-6.997188 0.063998v0.191996c-37.065894 0-77.737047-5.546551-122.024124-16.628986-13.77038 10.954438-28.266078 31.220683-43.487094 60.7774-15.221016 29.556718-23.060853 68.414575-23.540843 116.584238h-11.114435c-24.746151-79.571676-26.740776-146.076957-6.005209-199.52651 8.746484-22.548864 19.732922-38.079207 31.764672-49.321639 18.079623-20.660903 40.180496-36.009916 66.302619-46.068374a424.716485 424.716485 0 0 1 32.319326-11.029103c25.25814-9.034478 44.991063-16.767651 59.209433-23.210183a366.221704 366.221704 0 0 0 29.151393-14.869024l7.359847-4.266578a10.666444 10.666444 0 0 1 14.623695 3.733256z" fill="#7D99C8" p-id="11232"></path></svg>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 73 73" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#000000" stroke="#000000">
+
+<g id="SVGRepo_bgCarrier" stroke-width="0"/>
+
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@ -2,11 +2,12 @@

 project(example VERSION 0.1 LANGUAGES CXX)

+#配置通用编译
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-#获取文件路径分隔符（解决执行命令的时候有些平台会报错）
-file(TO_CMAKE_PATH "/" PATH_SEPARATOR)
+if(APPLE)
+    set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
+endif()

 #设置可执行文件输出目录
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
@ -15,6 +16,12 @@ else()
    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/release)
 endif()

+#获取文件路径分隔符（解决执行命令的时候有些平台会报错）
+file(TO_CMAKE_PATH "/" PATH_SEPARATOR)
+
+#设置版本号
+add_definitions(-DVERSION=1,3,1,0)
+
 find_package(Qt6 REQUIRED COMPONENTS Quick REQUIRED)

 #遍历所有Cpp文件
@ -32,20 +39,27 @@ foreach(filepath ${QML_PATHS})
 endforeach(filepath)

 #遍历所有资源文件
-file(GLOB_RECURSE RES_PATHS *.png *.jpg *.svg *.ico *.ttf *.webp)
+file(GLOB_RECURSE RES_PATHS *.png *.jpg *.svg *.ico *.ttf *.webp qmldir)
 foreach(filepath ${RES_PATHS})
    string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath})
    list(APPEND resource_files ${filename})
 endforeach(filepath)

 #添加可执行文件
-qt_add_executable(example
-    ${sources_files}
-)
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    qt_add_executable(example
+        ${sources_files}
+        example.rc
+    )
+else ()
+    qt_add_executable(example
+        ${sources_files}
+    )
+endif ()

 #复制动态库到可执行文件同级目录下
 if(WIN32)
-    if(${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
        set(DLLPATH ${CMAKE_SOURCE_DIR}/3rdparty/msvc/*.dll)
    else()
        set(DLLPATH ${CMAKE_SOURCE_DIR}/3rdparty/mingw/*.dll)
@ -63,7 +77,7 @@ endif()
 qt_add_qml_module(example
    URI example
    VERSION 1.0
-    QML_FILES ${qml_files} qml/global/qmldir
+    QML_FILES ${qml_files}
    RESOURCES ${resource_files}
 )

@ -77,8 +91,11 @@ set_target_properties(example PROPERTIES
 )

 #链接库
-target_link_libraries(example
-    PRIVATE Qt6::Quick
+target_link_libraries(example PRIVATE
+    Qt6::Quick
+    fluentuiplugin
+    FramelessHelper::Core
+    FramelessHelper::Quick
 )

 #安装
--- a/example/example.rc
+++ b/example/example.rc
@ -0,0 +1,42 @@
+#include <windows.h>
+
+IDI_ICON1 ICON "favicon.ico"
+
+#define STR(x) #x
+#define VER_JOIN(a,b,c,d) STR(a.b.c.d)
+#define VER_JOIN_(x) VER_JOIN x
+#define VER_STR VER_JOIN_((VERSION))
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION     VERSION
+PRODUCTVERSION  VERSION
+FILEFLAGSMASK   0x3fL
+#ifdef _DEBUG
+FILEFLAGS       VS_FF_DEBUG
+#else
+FILEFLAGS       0x0L
+#endif
+FILEOS          VOS_NT_WINDOWS32
+FILETYPE        VFT_APP
+FILESUBTYPE     VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments",         "Built by the FluentUI."
+            VALUE "CompanyName",      "zhuzichu"
+            VALUE "FileDescription",  "example"
+            VALUE "FileVersion",      VER_STR
+            VALUE "InternalName",     ""
+            VALUE "LegalCopyright",   "Copyright (C) 2023"
+            VALUE "OriginalFilename", ""
+            VALUE "ProductName",      "example"
+            VALUE "ProductVersion",   VER_STR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
--- a/example/favicon.ico
+++ b/example/favicon.ico
--- a/example/qml/App.qml
+++ b/example/qml/App.qml
@ -8,13 +8,11 @@ Window {
    id:app
    Component.onCompleted: {
        FluApp.init(app)
-        FluTheme.frameless = ("windows" === Qt.platform.os)
        FluTheme.darkMode = FluDarkMode.System
        FluApp.routes = {
            "/":"qrc:/example/qml/window/MainWindow.qml",
            "/about":"qrc:/example/qml/window/AboutWindow.qml",
            "/login":"qrc:/example/qml/window/LoginWindow.qml",
-            "/chat":"qrc:/example/qml/window/ChatWindow.qml",
            "/media":"qrc:/example/qml/window/MediaWindow.qml",
            "/singleTaskWindow":"qrc:/example/qml/window/SingleTaskWindow.qml",
            "/standardWindow":"qrc:/example/qml/window/StandardWindow.qml",
--- a/example/qml/TestWindow.qml
+++ b/example/qml/TestWindow.qml
@ -0,0 +1,69 @@
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Layouts
+import Qt.labs.platform
+import FluentUI
+import "qrc:///example/qml/global/"
+
+FluWindow {
+
+    id:window
+    title: "FluentUI"
+    width: 1000
+    height: 640
+    closeDestory:false
+    minimumWidth: 520
+    minimumHeight: 460
+    launchMode: FluWindow.SingleTask
+    visible: true
+
+    FluNavigationView2{
+        id:nav_view
+        anchors.fill: parent
+        items: ItemsOriginal
+        footerItems:ItemsFooter
+        z:11
+        displayMode:MainEvent.displayMode
+        logo: "qrc:/example/res/image/favicon.ico"
+        title:"FluentUI"
+        autoSuggestBox:FluAutoSuggestBox{
+            width: 280
+            anchors.centerIn: parent
+            iconSource: FluentIcons.Search
+            items: ItemsOriginal.getSearchData()
+            placeholderText: lang.search
+            onItemClicked:
+                (data)=>{
+                    ItemsOriginal.startPageByItem(data)
+                }
+        }
+        actionItem:Item{
+            height: 40
+            width: 148
+            RowLayout{
+                anchors.centerIn: parent
+                spacing: 5
+                FluText{
+                    text:lang.dark_mode
+                }
+                FluToggleSwitch{
+                    selected: FluTheme.dark
+                    clickFunc:function(){
+                        if(FluTheme.dark){
+                            FluTheme.darkMode = FluDarkMode.Light
+                        }else{
+                            FluTheme.darkMode = FluDarkMode.Dark
+                        }
+                    }
+                }
+            }
+        }
+        Component.onCompleted: {
+            ItemsOriginal.navigationView = nav_view
+            ItemsFooter.navigationView = nav_view
+//            nav_view.setCurrentIndex(0)
+        }
+    }
+
+}
--- a/example/qml/component/CodeExpander.qml
+++ b/example/qml/component/CodeExpander.qml
@ -36,7 +36,7 @@ FluExpander{
            topMargin: 5
        }
        onClicked:{
-            FluApp.clipText(content.text)
+            FluTools.clipText(content.text)
            showSuccess("复制成功")
        }
    }
@ -120,7 +120,9 @@ FluExpander{
          "FluStatusView",
          "FluRatingControl",
          "FluPasswordBox",
-          "FluBreadcrumbBar"
+          "FluBreadcrumbBar",
+          "FluCopyableText",
+          "FluAcrylic"
      ];
      code = code.replace(/\n/g, "<br>");
      code = code.replace(/ /g, "&nbsp;");
--- a/example/qml/component/CustomWindow.qml
+++ b/example/qml/component/CustomWindow.qml
@ -0,0 +1,64 @@
+import QtQuick
+import QtQuick.Layouts
+import FluentUI
+import org.wangwenx190.FramelessHelper
+
+FluWindow {
+
+    id:window
+
+    property bool fixSize
+    property alias titleVisible: title_bar.titleVisible
+    property bool appBarVisible: true
+    default property alias content: container.data
+
+    Component.onCompleted: {
+        console.debug(FramelessUtils.frameBorderVisible)
+    }
+
+    FluAppBar {
+        id: title_bar
+        title: window.title
+        visible: window.appBarVisible
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+        }
+        darkText: lang.dark_mode
+    }
+
+    Item{
+        id:container
+        anchors{
+            top: title_bar.bottom
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+        clip: true
+    }
+
+    FramelessHelper{
+        id:framless_helper
+        onReady: {
+            setTitleBarItem(title_bar)
+            framless_helper.moveWindowToDesktopCenter()
+            setHitTestVisible(title_bar.minimizeButton())
+            setHitTestVisible(title_bar.maximizeButton())
+            setHitTestVisible(title_bar.closeButton())
+            framless_helper.setWindowFixedSize(fixSize)
+            title_bar.maximizeButton.visible = !fixSize
+            window.visible = true
+        }
+    }
+
+    function setHitTestVisible(com){
+        framless_helper.setHitTestVisible(com)
+    }
+
+    function setTitleBarItem(com){
+        framless_helper.setTitleBarItem(com)
+    }
+
+}
--- a/example/qml/global/ItemsFooter.qml
+++ b/example/qml/global/ItemsFooter.qml
@ -4,11 +4,13 @@ import QtQuick
 import FluentUI

 FluObject{
-    id:footer_items

    property var navigationView

+    id:footer_items
+
    FluPaneItemSeparator{}
+
    FluPaneItem{
        title:lang.about
        icon:FluentIcons.Contact
@ -16,6 +18,7 @@ FluObject{
            FluApp.navigate("/about")
        }
    }
+
    FluPaneItem{
        title:lang.settings
        icon:FluentIcons.Settings
@ -23,4 +26,5 @@ FluObject{
            navigationView.push("qrc:/example/qml/page/T_Settings.qml")
        }
    }
+
 }
--- a/example/qml/global/ItemsOriginal.qml
+++ b/example/qml/global/ItemsOriginal.qml
@ -9,14 +9,14 @@ FluObject{

    FluPaneItem{
        title:lang.home
-        //        icon:FluentIcons.Home
-        cusIcon: Image{
-            anchors.centerIn: parent
-            source: FluTheme.dark ? "qrc:/example/res/svg/home_dark.svg" : "qrc:/example/res/svg/home.svg"
-            sourceSize: Qt.size(30,30)
-            width: 18
-            height: 18
-        }
+        icon:FluentIcons.Home
+        //        cusIcon: Image{
+        //            anchors.centerIn: parent
+        //            source: FluTheme.dark ? "qrc:/example/res/svg/home_dark.svg" : "qrc:/example/res/svg/home.svg"
+        //            sourceSize: Qt.size(30,30)
+        //            width: 18
+        //            height: 18
+        //        }
        onTap:{
            navigationView.push("qrc:/example/qml/page/T_Home.qml")
        }
@ -34,6 +34,12 @@ FluObject{
                navigationView.push("qrc:/example/qml/page/T_Buttons.qml")
            }
        }
+        FluPaneItem{
+            title:"Text"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Text.qml")
+            }
+        }
        FluPaneItem{
            title:"Slider"
            image:"qrc:/example/res/image/control/Slider.png"
@ -240,6 +246,12 @@ FluObject{
    FluPaneItemExpander{
        title:lang.theming
        icon:FluentIcons.Brightness
+        FluPaneItem{
+            title:"Acrylic"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Acrylic.qml")
+            }
+        }
        FluPaneItem{
            title:"Theme"
            onTap:{
--- a/example/qml/page/T_Acrylic.qml
+++ b/example/qml/page/T_Acrylic.qml
@ -0,0 +1,64 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "../component"
+
+FluScrollablePage{
+
+    title:"Acrylic"
+
+    FluArea{
+        Layout.fillWidth: true
+        Layout.topMargin: 20
+        height: 1200/5+20
+        paddings: 10
+
+        FluRectangle{
+            width: 1920/5
+            height: 1200/5
+            radius:[15,15,15,15]
+            Image {
+                id:image
+                asynchronous: true
+                source: "qrc:/example/res/image/banner_3.jpg"
+                anchors.fill: parent
+                sourceSize: Qt.size(2*width,2*height)
+            }
+            FluAcrylic {
+                sourceItem:image
+                anchors.bottom: parent.bottom
+                anchors.right: parent.right
+                width: 100
+                height: 100
+                FluText {
+                    anchors.centerIn: parent
+                    text: "Acrylic"
+                    color: "#FFFFFF"
+                    font.bold: true
+                }
+            }
+            Layout.topMargin: 20
+        }
+
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'Image{
+    id:image
+    width: 800
+    height: 600
+    source: "qrc:/example/res/image/image_huoyin.webp"
+    radius: 8
+    }
+    FluAcrylic{
+        sourceItem:image
+        width: 100
+        height: 100
+        anchors.centerIn: parent
+}'
+    }
+
+}
--- a/example/qml/page/T_Awesome.qml
+++ b/example/qml/page/T_Awesome.qml
@ -8,10 +8,6 @@ FluContentPage {

    title:"Awesome"

-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-
    FluTextBox{
        id:text_box
        placeholderText: "请输入关键字"
@ -55,7 +51,7 @@ FluContentPage {
                anchors.horizontalCenter: parent.horizontalCenter
                onClicked: {
                    var text  ="FluentIcons."+modelData.name;
-                    FluApp.clipText(text)
+                    FluTools.clipText(text)
                    showSuccess("您复制了 "+text)
                }
            }
--- a/example/qml/page/T_Badge.qml
+++ b/example/qml/page/T_Badge.qml
@ -9,11 +9,6 @@ FluScrollablePage{

    title:"Badge"

-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0
-
    FluArea{
        Layout.fillWidth: true
        Layout.topMargin: 20
--- a/example/qml/page/T_BreadcrumbBar.qml
+++ b/example/qml/page/T_BreadcrumbBar.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"BreadcurmbBar"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    Component.onCompleted: {
        var items = []
--- a/example/qml/page/T_Buttons.qml
+++ b/example/qml/page/T_Buttons.qml
@ -7,12 +7,8 @@ import FluentUI
 import "../component"

 FluScrollablePage{
-    title:"Buttons"

-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0
+    title:"Buttons"

    FluText{
        Layout.topMargin: 20
@ -113,7 +109,7 @@ FluScrollablePage{
            disabled:filled_button_switch.selected
            text:"Filled Button"
            onClicked: {
-                showWarning("点击FilledButton")
+                showWarning("点击FilledButton"+height)
            }
            anchors{
                verticalCenter: parent.verticalCenter
--- a/example/qml/page/T_CalendarPicker.qml
+++ b/example/qml/page/T_CalendarPicker.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"CalendarPicker"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        Layout.fillWidth: true
--- a/example/qml/page/T_Carousel.qml
+++ b/example/qml/page/T_Carousel.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"Carousel"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        Layout.fillWidth: true
--- a/example/qml/page/T_CheckBox.qml
+++ b/example/qml/page/T_CheckBox.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"CheckBox"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        Layout.fillWidth: true
--- a/example/qml/page/T_ColorPicker.qml
+++ b/example/qml/page/T_ColorPicker.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"ColorPicker"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        Layout.fillWidth: true
--- a/example/qml/page/T_DatePicker.qml
+++ b/example/qml/page/T_DatePicker.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"TimePicker"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        Layout.fillWidth: true
--- a/example/qml/page/T_Dialog.qml
+++ b/example/qml/page/T_Dialog.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"Dialog"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        Layout.fillWidth: true
--- a/example/qml/page/T_Expander.qml
+++ b/example/qml/page/T_Expander.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"Expander"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        Layout.fillWidth: true
--- a/example/qml/page/T_FlipView.qml
+++ b/example/qml/page/T_FlipView.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"FlipView"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        Layout.fillWidth: true
--- a/example/qml/page/T_Home.qml
+++ b/example/qml/page/T_Home.qml
@ -7,11 +7,6 @@ import FluentUI

 FluScrollablePage{

-
-    leftPadding:10
-    rightPadding:0
-    bottomPadding:20
-
    ListModel{
        id:model_header
        ListElement{
@ -27,6 +22,7 @@ FluScrollablePage{
        Layout.fillWidth: true
        height: 320
        Image {
+            id: bg
            fillMode:Image.PreserveAspectCrop
            anchors.fill: parent
            verticalAlignment: Qt.AlignTop
@ -41,7 +37,7 @@ FluScrollablePage{
        }
        FluText{
            text:"FluentUI Gallery"
-            fontStyle: FluText.TitleLarge
+            font: FluTextStyle.TitleLarge
            anchors{
                top: parent.top
                left: parent.left
@ -51,6 +47,7 @@ FluScrollablePage{
        }

        ListView{
+            id: list
            anchors{
                left: parent.left
                right: parent.right
@ -66,6 +63,7 @@ FluScrollablePage{
            }
            clip: false
            delegate:Item{
+                id: control
                width: 220
                height: 240
                FluArea{
@ -73,6 +71,15 @@ FluScrollablePage{
                    width: 200
                    height: 220
                    anchors.centerIn: parent
+                    color: 'transparent'
+                    FluAcrylic {
+                        sourceItem:bg
+                        anchors.fill: parent
+                        color: FluTheme.dark ? 'black' : 'white'
+                        rectX: list.x-list.contentX+10+(control.width)*index
+                        rectY: list.y+10
+                        acrylicOpacity:0.5
+                    }
                    Rectangle{
                        anchors.fill: parent
                        radius: 8
@ -101,7 +108,7 @@ FluScrollablePage{
                        }
                        FluText{
                            text: model.title
-                            fontStyle: FluText.Body
+                            font: FluTextStyle.Body
                            Layout.topMargin: 20
                            Layout.leftMargin: 20
                        }
@ -184,7 +191,7 @@ FluScrollablePage{
                FluText{
                    id:item_title
                    text:modelData.title
-                    fontStyle: FluText.BodyStrong
+                    font: FluTextStyle.BodyStrong
                    anchors{
                        left: item_icon.right
                        leftMargin: 20
@ -198,7 +205,7 @@ FluScrollablePage{
                    color:FluColors.Grey120
                    wrapMode: Text.WrapAnywhere
                    elide: Text.ElideRight
-                    fontStyle: FluText.Caption
+                    font: FluTextStyle.Caption
                    maximumLineCount: 2
                    anchors{
                        left: item_title.left
@ -236,7 +243,7 @@ FluScrollablePage{

    FluText{
        text: "Recently added samples"
-        fontStyle: FluText.Title
+        font: FluTextStyle.Title
        Layout.topMargin: 20
        Layout.leftMargin: 20
    }
@ -253,7 +260,7 @@ FluScrollablePage{

    FluText{
        text: "Recently updated samples"
-        fontStyle: FluText.Title
+        font: FluTextStyle.Title
        Layout.topMargin: 20
        Layout.leftMargin: 20
    }
--- a/example/qml/page/T_InfoBar.qml
+++ b/example/qml/page/T_InfoBar.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"InfoBar"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        Layout.fillWidth: true
--- a/example/qml/page/T_MediaPlayer.qml
+++ b/example/qml/page/T_MediaPlayer.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"MediaPlayer"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    onVisibleChanged: {
        if(visible){
--- a/example/qml/page/T_Menu.qml
+++ b/example/qml/page/T_Menu.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"Menu"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        Layout.fillWidth: true
--- a/example/qml/page/T_MultiWindow.qml
+++ b/example/qml/page/T_MultiWindow.qml
@ -11,10 +11,6 @@ FluScrollablePage{
    property var loginPageRegister: registerForWindowResult("/login")

    title:"MultiWindow"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    Connections{
        target: loginPageRegister
--- a/example/qml/page/T_Pivot.qml
+++ b/example/qml/page/T_Pivot.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"Pivot"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        Layout.fillWidth: true
--- a/example/qml/page/T_Progress.qml
+++ b/example/qml/page/T_Progress.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"Progress"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        Layout.fillWidth: true
--- a/example/qml/page/T_RatingControl.qml
+++ b/example/qml/page/T_RatingControl.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"RatingControl"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        Layout.fillWidth: true
--- a/example/qml/page/T_Rectangle.qml
+++ b/example/qml/page/T_Rectangle.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"Rectangle"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        Layout.fillWidth: true
@ -67,7 +63,7 @@ FluScrollablePage{
            }
            FluText{
                text:"配合图片使用"
-                fontStyle: FluText.SubTitle
+                font: FluTextStyle.Subtitle
                Layout.topMargin: 20
            }
            RowLayout{
@ -118,18 +114,17 @@ FluScrollablePage{
                }
            }
            FluRectangle{
-                width: 1080/5
-                height: 1439/5
-                radius:[25,25,25,25]
+                width: 1920/5
+                height: 1200/5
+                radius:[15,15,15,15]
                Image {
                    asynchronous: true
-                    source: "qrc:/example/res/image/image_huoyin.webp"
+                    source: "qrc:/example/res/image/banner_1.jpg"
                    anchors.fill: parent
-                    sourceSize: Qt.size(width,height)
+                    sourceSize: Qt.size(2*width,2*height)
                }
-                Layout.topMargin: 10
+                Layout.topMargin: 20
            }
-
        }
    }
    CodeExpander{
--- a/example/qml/page/T_Settings.qml
+++ b/example/qml/page/T_Settings.qml
@ -9,10 +9,6 @@ import "../component"
 FluScrollablePage{

    title:"Settings"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        Layout.fillWidth: true
@ -28,7 +24,7 @@ FluScrollablePage{
            }
            FluText{
                text:lang.dark_mode
-                fontStyle: FluText.BodyStrong
+                font: FluTextStyle.BodyStrong
                Layout.bottomMargin: 4
            }
            Repeater{
@ -62,7 +58,7 @@ FluScrollablePage{

            FluText{
                text:lang.navigation_view_display_mode
-                fontStyle: FluText.BodyStrong
+                font: FluTextStyle.BodyStrong
                Layout.bottomMargin: 4
            }
            Repeater{
@ -93,7 +89,7 @@ FluScrollablePage{

            FluText{
                text:lang.locale
-                fontStyle: FluText.BodyStrong
+                font: FluTextStyle.BodyStrong
                Layout.bottomMargin: 4
            }

--- a/example/qml/page/T_Slider.qml
+++ b/example/qml/page/T_Slider.qml
@ -8,10 +8,6 @@ import FluentUI
 FluScrollablePage{

    title:"Slider"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        Layout.fillWidth: true
--- a/example/qml/page/T_StatusView.qml
+++ b/example/qml/page/T_StatusView.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"StatusView"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        id:layout_actions
--- a/example/qml/page/T_TabView.qml
+++ b/example/qml/page/T_TabView.qml
@ -7,14 +7,10 @@ import "../component"

 FluScrollablePage{

-    title:"TabView"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0
-
    property var colors : [FluColors.Yellow,FluColors.Orange,FluColors.Red,FluColors.Magenta,FluColors.Purple,FluColors.Blue,FluColors.Teal,FluColors.Green]

+    title:"TabView"
+
    Component{
        id:com_page
        Rectangle{
--- a/example/qml/page/T_TableView.qml
+++ b/example/qml/page/T_TableView.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"TableView"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    Component.onCompleted: {
        const columns = [
@ -38,7 +34,7 @@ FluScrollablePage{
                          {
                              title: '操作',
                              dataIndex: 'action',
-                              width:100
+                              width:120
                          },
                      ];
        table_view.columns = columns
@ -66,21 +62,14 @@ FluScrollablePage{
                spacing: 10
                FluFilledButton{
                    text:"编辑"
-                    topPadding:3
-                    bottomPadding:3
-                    leftPadding:6
-                    rightPadding:6
+                    horizontalPadding: 6
                    onClicked:{
-                        console.debug(dataModel.index)
                        showSuccess(JSON.stringify(dataObject))
                    }
                }
                FluFilledButton{
                    text:"删除"
-                    topPadding:3
-                    bottomPadding:3
-                    leftPadding:6
-                    rightPadding:6
+                    horizontalPadding: 6
                    onClicked:{
                        showError(JSON.stringify(dataObject))
                    }
@ -89,20 +78,6 @@ FluScrollablePage{
        }
    }

-    function loadData(page,count){
-        const dataSource = []
-        for(var i=0;i<count;i++){
-            dataSource.push({
-                                name: "孙悟空%1".arg(((page-1)*count+i)),
-                                age: 500,
-                                address: "钟灵毓秀的花果山,如神仙仙境的水帘洞",
-                                nickname: "齐天大圣",
-                                action:com_action
-                            })
-        }
-        table_view.dataSource = dataSource
-    }
-
    CodeExpander{
        Layout.fillWidth: true
        Layout.topMargin: 10
@ -154,6 +129,17 @@ FluScrollablePage{
 }'
    }

-
-
+    function loadData(page,count){
+        const dataSource = []
+        for(var i=0;i<count;i++){
+            dataSource.push({
+                                name: "孙悟空%1".arg(((page-1)*count+i)),
+                                age: 500,
+                                address: "钟灵毓秀的花果山,如神仙仙境的水帘洞",
+                                nickname: "齐天大圣",
+                                action:com_action
+                            })
+        }
+        table_view.dataSource = dataSource
+    }
 }
--- a/example/qml/page/T_Text.qml
+++ b/example/qml/page/T_Text.qml
@ -0,0 +1,32 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+import "../component"
+
+FluScrollablePage{
+
+    title:"Text"
+
+    FluArea{
+        Layout.fillWidth: true
+        Layout.topMargin: 20
+        height: 60
+        paddings: 10
+
+        FluCopyableText{
+            text: "这是一个可以支持复制的Text"
+            anchors.verticalCenter: parent.verticalCenter
+        }
+
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluCopyableText{
+    text:"这是一个可以支持复制的Text"
+}'
+    }
+
+}
--- a/example/qml/page/T_TextBox.qml
+++ b/example/qml/page/T_TextBox.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"TextBox"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        Layout.fillWidth: true
--- a/example/qml/page/T_Theme.qml
+++ b/example/qml/page/T_Theme.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"Theme"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        Layout.fillWidth: true
--- a/example/qml/page/T_TimePicker.qml
+++ b/example/qml/page/T_TimePicker.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"TimePicker"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        Layout.fillWidth: true
--- a/example/qml/page/T_ToggleSwitch.qml
+++ b/example/qml/page/T_ToggleSwitch.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"ToggleSwitch"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluArea{
        Layout.fillWidth: true
--- a/example/qml/page/T_Tooltip.qml
+++ b/example/qml/page/T_Tooltip.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage{

    title:"Tooltip"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    FluText{
        Layout.topMargin: 20
--- a/example/qml/page/T_TreeView.qml
+++ b/example/qml/page/T_TreeView.qml
@ -8,10 +8,6 @@ import "../component"
 FluScrollablePage {

    title:"TreeView"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0

    function randomName() {
        var names = ["张三", "李四", "王五", "赵六", "钱七", "孙八", "周九", "吴十"]
--- a/example/qml/page/T_Typography.qml
+++ b/example/qml/page/T_Typography.qml
@ -5,11 +5,10 @@ import FluentUI

 FluContentPage {

+    property real textScale: 1
+
    title: "Typography"
-    property int textSize: FluTheme.textSize
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
+    rightPadding: 10

    Component.onCompleted: {
        slider.seek(0)
@ -26,47 +25,49 @@ FluContentPage {
        paddings: 10
        ColumnLayout{
            spacing: 0
+            scale: textScale
+            transformOrigin: Item.TopLeft
            FluText{
+                id:text_Display
                text:"Display"
                padding: 0
-                pixelSize: textSize
-                fontStyle: FluText.Display
+                font: FluTextStyle.Display
            }
            FluText{
+                id:text_TitleLarge
                text:"Title Large"
                padding: 0
-                pixelSize: textSize
-                fontStyle: FluText.TitleLarge
+                font: FluTextStyle.TitleLarge
            }
            FluText{
+                id:text_Title
                text:"Title"
                padding: 0
-                pixelSize: textSize
-                fontStyle: FluText.Title
+                font: FluTextStyle.Title
            }
            FluText{
+                id:text_Subtitle
                text:"Subtitle"
                padding: 0
-                pixelSize: textSize
-                fontStyle: FluText.SubTitle
+                font: FluTextStyle.Subtitle
            }
            FluText{
+                id:text_BodyStrong
                text:"Body Strong"
                padding: 0
-                pixelSize: textSize
-                fontStyle: FluText.BodyStrong
+                font: FluTextStyle.BodyStrong
            }
            FluText{
+                id:text_Body
                text:"Body"
                padding: 0
-                pixelSize: textSize
-                fontStyle: FluText.Body
+                font: FluTextStyle.Body
            }
            FluText{
+                id:text_Caption
                text:"Caption"
                padding: 0
-                pixelSize: textSize
-                fontStyle: FluText.Caption
+                font: FluTextStyle.Caption
            }
        }

@ -80,15 +81,8 @@ FluContentPage {
                topMargin: 30
            }
            onValueChanged:{
-                textSize = value/100*6+FluTheme.textSize
+                textScale = 1+value/100
            }
        }
-
    }
-
-
-
-
-
-
 }
--- a/example/qml/window/AboutWindow.qml
+++ b/example/qml/window/AboutWindow.qml
@ -2,28 +2,20 @@
 import QtQuick.Controls
 import QtQuick.Layouts
 import FluentUI
+import "../component"

-FluWindow {
+CustomWindow {

    id:window
    title:"关于"
    width: 600
    height: 600
-    minimumWidth: 600
-    minimumHeight: 600
-    maximumWidth: 600
-    maximumHeight: 600
+    fixSize: true
    launchMode: FluWindow.SingleTask

-    FluAppBar{
-        id:appbar
-        title:"关于"
-        width:parent.width
-    }
-
    ColumnLayout{
        anchors{
-            top: appbar.bottom
+            top: parent.top
            left: parent.left
            right: parent.right
        }
@ -34,11 +26,17 @@ FluWindow {
            spacing: 14
            FluText{
                text:"FluentUI"
-                fontStyle: FluText.Title
+                font: FluTextStyle.Title
+                MouseArea{
+                    anchors.fill: parent
+                    onClicked: {
+                        FluApp.navigate("/")
+                    }
+                }
            }
            FluText{
                text:"v%1".arg(appInfo.version)
-                fontStyle: FluText.Body
+                font: FluTextStyle.Body
                Layout.alignment: Qt.AlignBottom
            }
        }
@ -113,6 +111,7 @@ FluWindow {

        RowLayout{
            spacing: 14
+            Layout.topMargin: 20
            Layout.leftMargin: 15
            FluText{
                text:"捐赠："
@ -124,15 +123,15 @@ FluWindow {
            Layout.preferredHeight: 252
            Row{
                anchors.horizontalCenter: parent.horizontalCenter
-                spacing: 60
+                spacing: 30
                Image{
-                    width: 164.55
-                    height: 224.25
+                    width: 250
+                    height: 250
                    source: "qrc:/example/res/image/qrcode_wx.jpg"
                }
                Image{
-                    width: 162
-                    height: 252
+                    width: 250
+                    height: 250
                    source: "qrc:/example/res/image/qrcode_zfb.jpg"
                }
            }
@ -141,12 +140,11 @@ FluWindow {
        RowLayout{
            spacing: 14
            Layout.leftMargin: 15
+            Layout.topMargin: 20
            FluText{
                id:text_desc
                text:"个人开发，维护不易，你们的捐赠就是我继续更新的动力！\n有什么问题提Issues，只要时间充足我就会解决的！！"
            }
        }
-
-
    }
 }
--- a/example/qml/window/ChatWindow.qml
+++ b/example/qml/window/ChatWindow.qml
@ -1,261 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import FluentUI
-import Controller
-import QtQuick.Dialogs
-
-FluWindow {
-
-    title:"ChatGPT"
-    width: 680
-    height: 600
-    minimumWidth: 500
-    minimumHeight: 600
-
-    onInitArgument:
-        (argument)=>{
-            scrollview.focus = true
-        }
-
-    ChatController{
-        id:controller
-
-        onResponseDataChanged: {
-            appendMessage(false,responseData)
-        }
-
-    }
-
-    ListModel{
-        id:model_message
-        ListElement{
-            isMy:false
-            text:"欢迎使用ChatGPT"
-        }
-        ListElement{
-            isMy:true
-            text:"好的，3Q"
-        }
-    }
-
-    FluAppBar{
-        id:appbar
-        title:"ChatGPT"
-        width:parent.width
-    }
-
-    Component{
-        id:com_text
-        TextEdit {
-            id:item_text
-            text: message
-            wrapMode: Text.WrapAnywhere
-            readOnly: true
-            selectByMouse: true
-            selectByKeyboard: true
-            selectedTextColor: Qt.rgba(51,153,255,1)
-            color:FluColors.Black
-            selectionColor: {
-                if(FluTheme.dark){
-                    return FluTheme.primaryColor.lighter
-                }else{
-                    return FluTheme.primaryColor.dark
-                }
-            }
-            width: Math.min(list_message.width-200,600,implicitWidth)
-            TapHandler{
-                acceptedButtons: Qt.RightButton
-                onTapped: {
-                    menu_item.showMenu(item_text.selectedText)
-                }
-            }
-        }
-    }
-
-    FluArea{
-        id:layout_content
-        anchors{
-            top: appbar.bottom
-            left: parent.left
-            right: parent.right
-            bottom: layout_bottom.top
-            margins: 10
-        }
-        color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(245/255,245/255,245/255,1)
-        ListView{
-            id:list_message
-            anchors.fill: parent
-            model:model_message
-            clip: true
-            ScrollBar.vertical: FluScrollBar {}
-            preferredHighlightBegin: 0
-            preferredHighlightEnd: 0
-            highlightMoveDuration: 0
-            header:Item{
-                width: list_message.width
-                height:20
-            }
-            footer:Item{
-                width: list_message.width
-                height:20
-            }
-            delegate: Item{
-                width: ListView.view.width
-                height: childrenRect.height
-
-                FluRectangle{
-                    id:item_avatar
-                    width: 30
-                    height: 30
-                    radius:[15,15,15,15]
-                    anchors{
-                        right: isMy ? parent.right : undefined
-                        rightMargin: isMy ? 20 : undefined
-                        left: isMy ? undefined : parent.left
-                        leftMargin: isMy ? undefined : 20
-                        top:parent.top
-                    }
-                    Image {
-                        asynchronous: true
-                        anchors.fill: parent
-                        sourceSize: Qt.size(100,100)
-                        source: isMy ? "qrc:/example/res/svg/avatar_2.svg" : "qrc:/example/res/image/logo_openai.png"
-                    }
-                }
-
-                Rectangle{
-                    id:item_layout_content
-                    color: isMy ? "#FF95EC69" : "#FFFFFF"
-                    width: item_msg_loader.width+10
-                    height: item_msg_loader.height+10
-                    radius: 3
-                    anchors{
-                        top: item_avatar.top
-                        right: isMy ? item_avatar.left : undefined
-                        rightMargin: isMy ? 10 : undefined
-                        left: isMy ? undefined : item_avatar.right
-                        leftMargin: isMy ? undefined : 10
-
-                    }
-
-                    Loader{
-                        id:item_msg_loader
-                        property var message: model.text
-                        anchors.centerIn: parent
-                        sourceComponent: com_text
-                    }
-                }
-
-
-                Item{
-                    id:item_layout_bottom
-                    width: parent.width
-                    anchors.top: item_layout_content.bottom
-                    height: 20
-                }
-            }
-        }
-    }
-
-    FluArea{
-        id:layout_bottom
-        height: 90
-        anchors{
-            bottom: parent.bottom
-            bottomMargin: 10
-            left: parent.left
-            right: parent.right
-            leftMargin: 10
-            rightMargin: 10
-        }
-
-
-        ScrollView{
-            id:scrollview
-            anchors{
-                bottom: parent.bottom
-                left: parent.left
-                right: button_send.left
-                bottomMargin: 10
-                leftMargin: 10
-                rightMargin: 10
-            }
-            height: Math.min(textbox.implicitHeight,64)
-            FluMultilineTextBox{
-                id:textbox
-                focus:true
-                placeholderText: "请输入消息"
-            }
-        }
-
-        FluFilledButton{
-            id:button_send
-            text:controller.isLoading ? timer_loading.loadingText :"发送"
-            anchors{
-                bottom: parent.bottom
-                right: parent.right
-                bottomMargin: 10
-                rightMargin: 10
-            }
-            width: 60
-            disabled: controller.isLoading
-            onClicked:{
-                var text = textbox.text
-                appendMessage(true,text)
-                controller.sendMessage(text)
-                textbox.clear()
-            }
-
-            Timer{
-                id:timer_loading
-                property int count : 0
-                property string loadingText : ""
-                interval: 500
-                running: controller.isLoading
-                repeat: true
-                onTriggered: {
-                    switch(count%3){
-                    case 0:
-                        loadingText = "."
-                        break
-                    case 1:
-                        loadingText = ".."
-                        break
-                    case 2:
-                        loadingText = "..."
-                        break
-                    default:
-                        loadingText = ""
-                        break
-                    }
-                    count++
-                }
-            }
-
-        }
-    }
-
-    FluMenu{
-        id:menu_item
-        focus: false
-        property string selectedText: ""
-        FluMenuItem{
-            text:"复制"
-            onClicked: {
-                controller.clipText(menu_item.selectedText)
-                showSuccess("复制成功")
-            }
-        }
-        function showMenu(text){
-            menu_item.selectedText = text
-            menu_item.popup()
-        }
-    }
-
-    function appendMessage(isMy,text){
-        model_message.append({isMy:isMy,text:text})
-        list_message.positionViewAtEnd()
-    }
-
-}
--- a/example/qml/window/LoginWindow.qml
+++ b/example/qml/window/LoginWindow.qml
@ -2,17 +2,15 @@
 import QtQuick.Layouts
 import QtQuick.Controls
 import FluentUI
+import "../component"

-FluWindow {
+CustomWindow {

    id:window
    title:"登录"
    width: 400
    height: 400
-    minimumWidth: 400
-    minimumHeight: 400
-    maximumWidth: 400
-    maximumHeight: 400
+    fixSize: true

    onInitArgument:
        (argument)=>{
@ -20,12 +18,6 @@ FluWindow {
            textbox_password.focus =  true
        }

-    FluAppBar{
-        id:appbar
-        title:"登录"
-        width:parent.width
-    }
-
    ColumnLayout{
        anchors{
            left: parent.left
--- a/example/qml/window/MainWindow.qml
+++ b/example/qml/window/MainWindow.qml
@ -4,10 +4,10 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Qt.labs.platform
 import FluentUI
-import example
+import "../component"
 import "qrc:///example/qml/global/"

-FluWindow {
+CustomWindow {

    id:window
    title: "FluentUI"
@ -16,6 +16,8 @@ FluWindow {
    closeDestory:false
    minimumWidth: 520
    minimumHeight: 460
+    appBarVisible: false
+    launchMode: FluWindow.SingleTask

    closeFunc:function(event){
        close_app.open()
@ -31,14 +33,6 @@ FluWindow {
        }
    }

-    FluAppBar{
-        id:appbar
-        z:9
-        showDark: true
-        width:parent.width
-        darkText: lang.dark_mode
-    }
-
    SystemTrayIcon {
        id:system_tray
        visible: true
@ -48,7 +42,7 @@ FluWindow {
            MenuItem {
                text: "退出"
                onTriggered: {
-                    window.destoryWindow()
+                    window.deleteWindow()
                    FluApp.closeApp()
                }
            }
@ -76,18 +70,35 @@ FluWindow {
        positiveText:"退出"
        neutralText:"取消"
        onPositiveClicked:{
-            window.destoryWindow()
+            window.deleteWindow()
            FluApp.closeApp()
        }
+    }

+    FluAppBar {
+        id: title_bar
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+        }
+        darkText: lang.dark_mode
+        showDark: true
+        z:7
    }

    FluNavigationView{
        id:nav_view
-        anchors.fill: parent
+        anchors{
+            top: parent.top
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+        z:999
        items: ItemsOriginal
        footerItems:ItemsFooter
-        z:11
+        topPadding:FluTools.isMacos() ? 20 : 5
        displayMode:MainEvent.displayMode
        logo: "qrc:/example/res/image/favicon.ico"
        title:"FluentUI"
@ -108,5 +119,4 @@ FluWindow {
            nav_view.setCurrentIndex(0)
        }
    }
-
 }
--- a/example/qml/window/MediaWindow.qml
+++ b/example/qml/window/MediaWindow.qml
@ -2,8 +2,9 @@
 import QtQuick.Controls
 import QtQuick.Layouts
 import FluentUI
+import "../component"

-FluWindow {
+CustomWindow {

    title:"视频播放器"
    width: 640
@ -16,18 +17,12 @@ FluWindow {
            player.source = argument.source
        }

-    FluAppBar{
-        id:appbar
-        title:"视频播放器"
-        width:parent.width
-    }
-
    FluMediaPlayer{
        id:player
        anchors{
            left: parent.left
            right: parent.right
-            top: appbar.bottom
+            top: parent.top
            bottom: parent.bottom
        }
    }
--- a/example/qml/window/SingleInstanceWindow.qml
+++ b/example/qml/window/SingleInstanceWindow.qml
@ -2,25 +2,17 @@
 import QtQuick.Controls
 import QtQuick.Layouts
 import FluentUI
+import "../component"

-FluWindow {
+CustomWindow {

    id:window
    title:"SingleInstance"
    width: 500
    height: 600
-    minimumWidth: 500
-    minimumHeight: 600
-    maximumWidth: 500
-    maximumHeight: 600
+    fixSize: true
    launchMode: FluWindow.SingleInstance

-    FluAppBar{
-        id:appbar
-        title:"SingleInstance"
-        width:parent.width
-    }
-
    FluTextBox{
        anchors{
            top:parent.top
@ -40,5 +32,4 @@ FluWindow {
        }
        text:"我是一个SingleInstance模式的窗口，如果我存在，我会销毁之前的窗口，并创建一个新窗口"
    }
-
 }
--- a/example/qml/window/SingleTaskWindow.qml
+++ b/example/qml/window/SingleTaskWindow.qml
@ -2,25 +2,17 @@
 import QtQuick.Controls
 import QtQuick.Layouts
 import FluentUI
+import "../component"

-FluWindow {
+CustomWindow {

    id:window
    title:"SingleTask"
    width: 500
    height: 600
-    minimumWidth: 500
-    minimumHeight: 600
-    maximumWidth: 500
-    maximumHeight: 600
+    fixSize: true
    launchMode: FluWindow.SingleTask

-    FluAppBar{
-        id:appbar
-        title:"SingleTask"
-        width:parent.width
-    }
-
    FluText{
        anchors.centerIn: parent
        text:"我是一个SingleTask模式的窗口，如果我存在，我就激活窗口"
--- a/example/qml/window/StandardWindow.qml
+++ b/example/qml/window/StandardWindow.qml
@ -2,25 +2,17 @@
 import QtQuick.Controls
 import QtQuick.Layouts
 import FluentUI
+import "../component"

-FluWindow {
+CustomWindow {

    id:window
    title:"Standard"
    width: 500
    height: 600
-    minimumWidth: 500
-    minimumHeight: 600
-    maximumWidth: 500
-    maximumHeight: 600
+    fixSize: true
    launchMode: FluWindow.Standard

-    FluAppBar{
-        id:appbar
-        title:"Standard"
-        width:parent.width
-    }
-
    FluText{
        anchors.centerIn: parent
        text:"我是一个Standard模式的窗口，每次我都会创建一个新的窗口"
--- a/example/res/image/image_huoyin.webp
+++ b/example/res/image/image_huoyin.webp
--- a/example/res/image/qrcode_wx.jpg
+++ b/example/res/image/qrcode_wx.jpg
--- a/example/res/image/qrcode_zfb.jpg
+++ b/example/res/image/qrcode_zfb.jpg
--- a/example/src/AppInfo.cpp
+++ b/example/src/AppInfo.cpp
@ -1,11 +1,17 @@
 #include "AppInfo.h"
 #include "lang/En.h"
 #include "lang/Zh.h"
+#include <QDebug>
+
+#define STR(x) #x
+#define VER_JOIN(a,b,c,d) STR(a.b.c.d)
+#define VER_JOIN_(x) VER_JOIN x
+#define VER_STR VER_JOIN_((VERSION))

 AppInfo::AppInfo(QObject *parent)
    : QObject{parent}
 {
-    version("1.2.8");
+    version(VER_STR);
    lang(new En());
 }

--- a/example/src/controller/ChatController.cpp
+++ b/example/src/controller/ChatController.cpp
@ -1,56 +0,0 @@
-#include "ChatController.h"
-
-ChatController::ChatController(QObject *parent)
-    : QObject{parent}
-{
-    isLoading(false);
-    networkManager = new QNetworkAccessManager(this);
-}
-
-
-void ChatController::sendMessage(const QString& text){
-    isLoading(true);
-    QUrl apiUrl("https://api.openai.com/v1/chat/completions");
-    QNetworkRequest request(apiUrl);
-    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    request.setRawHeader("Authorization", QString::fromStdString("Bearer %1").arg(QString::fromUtf8(QByteArray::fromBase64(baseKey.toUtf8()))).toUtf8());
-    QJsonObject requestData;
-    requestData.insert("model", "gpt-3.5-turbo");
-    messages.append(createMessage("user",text));
-    requestData.insert("messages", messages);
-    QJsonDocument requestDoc(requestData);
-    QByteArray requestDataBytes = requestDoc.toJson();
-    QNetworkReply* reply = networkManager->post(request, requestDataBytes);
-    connect(reply, &QNetworkReply::finished,this, [=]() {
-        if (reply->error() == QNetworkReply::NoError) {
-            QString responseString = QString::fromUtf8(reply->readAll());
-            qDebug() << responseString;
-            QJsonDocument doc = QJsonDocument::fromJson(responseString.toUtf8());
-            QJsonObject jsonObj = doc.object();
-            QString text = jsonObj.value("choices").toArray().at(0).toObject().value("message").toObject().value("content").toString();
-            if(text.isEmpty()){
-                text = "响应错误：content为空数据";
-            }else{
-                messages.append(createMessage("assistant",text));
-            }
-            responseData(text.trimmed());
-        } else {
-            responseData("网络错误："+reply->errorString());
-        }
-        isLoading(false);
-        reply->deleteLater();
-    });
-}
-
-QJsonObject ChatController::createMessage(const QString& role,const QString& content){
-    QJsonObject message;
-    message.insert("role",role);
-    message.insert("content",content);
-    return message;
-}
-
-void ChatController::clipText(const QString& text){
-    qDebug()<<text;
-    QClipboard *clipboard = QGuiApplication::clipboard();
-    clipboard->setText(text);
-}
--- a/example/src/controller/ChatController.h
+++ b/example/src/controller/ChatController.h
@ -1,35 +0,0 @@
-#ifndef CHATCONTROLLER_H
-#define CHATCONTROLLER_H
-
-#include <QObject>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QGuiApplication>
-#include <QClipboard>
-#include <QByteArray>
-#include <QFile>
-#include "../stdafx.h"
-
-class ChatController : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY_AUTO(bool,isLoading)
-    Q_PROPERTY_AUTO(QString,responseData);
-public:
-    explicit ChatController(QObject *parent = nullptr);
-
-    Q_INVOKABLE void sendMessage(const QString& text);
-    Q_INVOKABLE void clipText(const QString& text);
-private:
-    QJsonObject createMessage(const QString& role,const QString& content);
-
-private:
-    QNetworkAccessManager* networkManager;
-    QJsonArray messages;
-    QString baseKey = "c2stbXgxWm5MQkZ5TzhNYzNmRWl6eDZUM0JsYmtGSnNBWjNiakJjSXB6WGN3QW9KSk11";
-};
-
-#endif // CHATCONTROLLER_H
--- a/example/src/main.cpp
+++ b/example/src/main.cpp
@ -4,27 +4,24 @@
 #include <QDir>
 #include <QQuickWindow>
 #include <QProcess>
+#include <FramelessHelper/Quick/framelessquickmodule.h>
+#include <FramelessHelper/Core/private/framelessconfig_p.h>
 #include "lang/Lang.h"
 #include "AppInfo.h"
-#include "controller/ChatController.h"
 #include "tool/IPC.h"
-#if defined(STATICLIB)
-#include <FluentUI.h>
-#endif

-int main(int argc, char *argv[])
+FRAMELESSHELPER_USE_NAMESPACE
+
+    int main(int argc, char *argv[])
 {
    //将样式设置为Basic，不然会导致组件显示异常
    qputenv("QT_QUICK_CONTROLS_STYLE","Basic");
-    //6.4及以下监听系统深色模式变化
-#ifdef Q_OS_WIN
-    qputenv("QT_QPA_PLATFORM","windows:darkmode=2");
-#endif
+    FramelessHelper::Quick::initialize();
    QGuiApplication::setOrganizationName("ZhuZiChu");
    QGuiApplication::setOrganizationDomain("https://zhuzichu520.github.io");
    QGuiApplication::setApplicationName("FluentUI");
-    //    QQuickWindow::setGraphicsApi(QSGRendererInterface::Software);
    QGuiApplication app(argc, argv);
+    FramelessConfig::instance()->set(Global::Option::ForceHideWindowFrameBorder);
    AppInfo* appInfo = new AppInfo();
    IPC ipc(0);
    QString activeWindowEvent = "activeWindow";
@ -41,10 +38,7 @@ int main(int argc, char *argv[])
    }
    app.setQuitOnLastWindowClosed(false);
    QQmlApplicationEngine engine;
-#if defined(STATICLIB)
-    FluentUI::initialize(&engine);
-#endif
-    qmlRegisterType<ChatController>("Controller",1,0,"ChatController");
+    FramelessHelper::Quick::registerTypes(&engine);
    QQmlContext * context = engine.rootContext();
    Lang* lang = appInfo->lang();
    context->setContextProperty("lang",lang);
@ -53,6 +47,7 @@ int main(int argc, char *argv[])
    });
    context->setContextProperty("appInfo",appInfo);
    const QUrl url(QStringLiteral("qrc:/example/qml/App.qml"));
+    //    const QUrl url(QStringLiteral("qrc:/example/qml/TestWindow.qml"));
    QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
        &app, [url](QObject *obj, const QUrl &objUrl) {
            if (!obj && url == objUrl)
--- a/1
+++ b/1
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -1,59 +1,75 @@
 cmake_minimum_required(VERSION 3.16)
-project(fluentui LANGUAGES CXX)

+project(fluentuiplugin LANGUAGES CXX)
+
+#配置通用编译
 set(CMAKE_AUTOMOC ON)
-
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/debug)
-else()
-  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/release)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+if(APPLE)
+    set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
 endif()

-find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml)
+#设置QML插件输出目录->D:\Qt\6.4.3\msvc2019_64\qml\FluentUI
+set(QML_PLUGIN_DIRECTORY ${CMAKE_PREFIX_PATH}/qml/FluentUI)

+#设置版本号
+add_definitions(-DVERSION=1,3,1,0)
+
+find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml ShaderTools)
+
+#遍历所有Cpp文件
 file(GLOB_RECURSE CPP_FILES *.cpp *.h)
 foreach(filepath ${CPP_FILES})
    string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath})
    list(APPEND sources_files ${filename})
 endforeach(filepath)

+#遍历所有qml文件
 file(GLOB_RECURSE QML_PATHS *.qml)
 foreach(filepath ${QML_PATHS})
    string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath})
    list(APPEND qml_files ${filename})
 endforeach(filepath)

-file(GLOB_RECURSE RES_PATHS *.png *.jpg *.svg *.ico *.ttf *.webp)
+#遍历所有资源文件
+file(GLOB_RECURSE RES_PATHS *.png *.jpg *.svg *.ico *.ttf *.webp *.qsb *.metainfo)
 foreach(filepath ${RES_PATHS})
    string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath})
    list(APPEND resource_files ${filename})
 endforeach(filepath)

+#修改资源文件导出路径
 foreach(filepath IN LISTS qml_files resource_files)
    string(REPLACE "imports/FluentUI/" "" filename ${filepath})
    set_source_files_properties(${filepath} PROPERTIES QT_RESOURCE_ALIAS ${filename})
 endforeach()

-qt_add_qml_module(fluentui
-    OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FluentUI
+#添加qml模块
+qt_add_library(fluentuiplugin SHARED)
+qt_add_qml_module(fluentuiplugin
+    #没有下面这行代码就会生成fluentuiplugin.dll与fluentuipluginplugin.dll两个动态库
+    PLUGIN_TARGET fluentuiplugin
+    OUTPUT_DIRECTORY ${QML_PLUGIN_DIRECTORY}
    VERSION 1.0
    URI "FluentUI"
-    SOURCES ${sources_files}
+    SOURCES ${sources_files} fluentui.rc
    QML_FILES ${qml_files}
    RESOURCES ${resource_files}
+    #支持designer
+    DESIGNER_SUPPORTED
 )

-set_target_properties(fluentui PROPERTIES
-    WIN32_EXECUTABLE TRUE
-    MACOSX_BUNDLE TRUE
-)
-
-target_link_libraries(fluentui PUBLIC
-    Qt::Core
-    Qt::Quick
-    Qt::Qml
+#链接库
+target_link_libraries(fluentuiplugin PUBLIC
+    Qt::CorePrivate
+    Qt::QuickPrivate
+    Qt::QmlPrivate
 )

+#链接库 win32库 不然mingw会编译错误
 if(WIN32)
-    target_link_libraries(fluentui PRIVATE dwmapi user32)
+    target_link_libraries(fluentuiplugin PRIVATE dwmapi user32)
 endif()
+
+#如果是debug，则生成的库文件名后面拼接d
+set_target_properties(fluentuiplugin PROPERTIES DEBUG_POSTFIX "d")
--- a/src/Def.h
+++ b/src/Def.h
@ -6,13 +6,13 @@

 namespace Fluent_DarkMode {
 Q_NAMESPACE
-    enum Fluent_DarkModeType {
-        System      = 0x0,
-        Light    = 0x1,
-        Dark     = 0x2,
-    };
-    QML_NAMED_ELEMENT(FluDarkMode)
-Q_ENUMS(Fluent_DarkModeType);
+enum Fluent_DarkModeType {
+    System      = 0x0,
+    Light    = 0x1,
+    Dark     = 0x2,
+};
+Q_ENUM_NS(Fluent_DarkModeType)
+QML_NAMED_ELEMENT(FluDarkMode)
 }

 namespace Fluent_Awesome {
@ -1422,8 +1422,8 @@ enum class Fluent_AwesomeType {
    SpeechSolidBold=0xf8b2,
    ClickedOutLoudSolidBold=0xf8b3,
 };
- QML_NAMED_ELEMENT(FluentIcons)
-Q_ENUMS(Fluent_AwesomeType)
+Q_ENUM_NS(Fluent_AwesomeType)
+QML_NAMED_ELEMENT(FluentIcons)
 }

 #endif // DEF_H
--- a/src/FluApp.cpp
+++ b/src/FluApp.cpp
@ -8,35 +8,16 @@
 #include <QUuid>
 #include <QFontDatabase>
 #include <QClipboard>
-#include "FluTheme.h"
 #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>
-static bool isCompositionEnabled()
+FluApp* FluApp::m_instance = nullptr;
+
+FluApp *FluApp::getInstance()
 {
-    BOOL composition_enabled = FALSE;
-    bool success = ::DwmIsCompositionEnabled(&composition_enabled) == S_OK;
-    return composition_enabled && success;
-}
-#endif
-
-FluApp* FluApp::fluApp = nullptr;
-FluTheme* FluApp::fluTheme = nullptr;
-FluColors* FluApp::flutColors = nullptr;
-
-void FluApp::setFluApp(FluApp* val){
-    FluApp::fluApp = val;
-}
-void FluApp::setFluTheme(FluTheme* val){
-    FluApp::fluTheme = val;
-}
-void FluApp::setFluColors(FluColors* val){
-    FluApp::flutColors = val;
+    if(FluApp::m_instance == nullptr){
+        FluApp::m_instance = new FluApp;
+    }
+    return FluApp::m_instance;
 }

 FluApp::FluApp(QObject *parent)
@ -45,21 +26,15 @@ FluApp::FluApp(QObject *parent)
    QFontDatabase::addApplicationFont(":/FluentUI/Font/Segoe_Fluent_Icons.ttf");
 }

+FluApp::~FluApp(){
+
+}
+
 void FluApp::init(QQuickWindow *window){
    this->appWindow = window;
-    QQmlEngine *engine = qmlEngine(appWindow);
-    QQmlComponent component(engine, ":/FluentUI/Controls/FluSingleton.qml");
-    component.create();
-    nativeEvent = new NativeEventFilter();
-    qApp->installNativeEventFilter(nativeEvent);
 }

 void FluApp::run(){
-#ifdef Q_OS_WIN
-    if(!isCompositionEnabled()){
-        fluTheme->frameless(false);
-    }
-#endif
    navigate(initialRoute());
 }

@ -76,37 +51,33 @@ void FluApp::navigate(const QString& route,const QJsonObject& argument,FluRegist
        properties.insert("pageRegister",QVariant::fromValue(fluRegister));
    }
    properties.insert("argument",argument);
-    QQuickWindow *view = qobject_cast<QQuickWindow*>(component.createWithInitialProperties(properties));
-    int launchMode = view->property("launchMode").toInt();
-    if(launchMode==1){
-        for (auto& pair : wnds) {
-            QString r =  pair->property("route").toString();
-            if(r == route){
-                pair->setProperty("argument",argument);
-                pair->raise();
-                pair->requestActivate();
-                view->deleteLater();
-                return;
-            }
-        }
-    }else if(launchMode==2){
-        for (auto& pair : wnds) {
-            QString r =  pair->property("route").toString();
-            if(r == route){
-                pair->close();
-                break;
-            }
+    QQuickWindow *view=nullptr;
+    for (auto& pair : wnds) {
+        QString r =  pair->property("route").toString();
+        if(r == route){
+            view = pair;
+            break;
        }
    }
-    if(fluTheme->frameless()){
-        view->setFlag(Qt::FramelessWindowHint,true);
+    if(view){
+        //如果窗口存在，则判断启动模式
+        int launchMode = view->property("launchMode").toInt();
+        if(launchMode == 1){
+            view->setProperty("argument",argument);
+            view->show();
+            view->raise();
+            view->requestActivate();
+            return;
+        }else if(launchMode == 2){
+            view->close();
+        }
    }
+    view = qobject_cast<QQuickWindow*>(component.createWithInitialProperties(properties));
    wnds.insert(view->winId(),view);
    if(fluRegister){
        fluRegister->to(view);
    }
    view->setColor(QColor(Qt::transparent));
-    view->show();
 }

 QJsonArray FluApp::awesomelist(const QString& keyword)
@ -133,14 +104,6 @@ QJsonArray FluApp::awesomelist(const QString& keyword)
    return arr;
 }

-void FluApp::clipText(const QString& text){
-    QGuiApplication::clipboard()->setText(text);
-}
-
-QString FluApp::uuid(){
-    return QUuid::createUuid().toString();
-}
-
 void FluApp::closeApp(){
    qApp->exit(0);
 }
--- a/src/FluApp.h
+++ b/src/FluApp.h
@ -8,46 +8,82 @@
 #include <QQmlContext>
 #include <QJsonObject>
 #include <QQmlEngine>
-#include "FluTheme.h"
-#include "FluColors.h"
-#include "NativeEventFilter.h"
 #include "FluRegister.h"
 #include "stdafx.h"

+/**
+ * @brief The FluApp class
+ */
 class FluApp : public QObject
 {
    Q_OBJECT
+    /**
+     * @brief initialRoute 初始路由
+     */
    Q_PROPERTY_AUTO(QString,initialRoute);
+
+    /**
+     * @brief routes 路由表
+     */
    Q_PROPERTY_AUTO(QJsonObject,routes);
+
    QML_NAMED_ELEMENT(FluApp)
    QML_SINGLETON
-public:
-    static FluApp *getInstance();
+private:
+    /**
+     * @brief FluApp 将默认构造函数设置为私有，则qml创建单例就会走create工厂方法创建单例
+     * @param parent
+     */
    explicit FluApp(QObject *parent = nullptr);
-    ~FluApp(){
-        if (nativeEvent != Q_NULLPTR) {
-            delete nativeEvent;
-            nativeEvent = Q_NULLPTR;
-        }
+public:
+    ~FluApp();
+    static FluApp *create(QQmlEngine *qmlEngine, QJSEngine *jsEngine)
+    {
+        return getInstance();
    }
+    static FluApp *getInstance();
+    /**
+     * @brief run
+     */
    Q_INVOKABLE void run();
+
+    /**
+     * @brief navigate
+     * @param route
+     * @param argument
+     * @param fluRegister
+     */
    Q_INVOKABLE void navigate(const QString& route,const QJsonObject& argument  = {},FluRegister* fluRegister = nullptr);
+
+    /**
+     * @brief init
+     * @param window
+     */
    Q_INVOKABLE void init(QQuickWindow *window);
+
+    /**
+     * @brief awesomelist
+     * @param keyword
+     * @return
+     */
    Q_INVOKABLE QJsonArray awesomelist(const QString& keyword = "");
-    Q_INVOKABLE void clipText(const QString& text);
-    Q_INVOKABLE QString uuid();
+
+    /**
+     * @brief closeApp
+     */
    Q_INVOKABLE void closeApp();
-    Q_INVOKABLE void setFluApp(FluApp* val);
-    Q_INVOKABLE void setFluTheme(FluTheme* val);
-    Q_INVOKABLE void setFluColors(FluColors* val);

 public:
+    /**
+     * @brief wnds
+     */
    QMap<quint64, QQuickWindow*> wnds;
-    static FluApp* fluApp;
-    static FluTheme* fluTheme;
-    static FluColors* flutColors;
+
 private:
-    NativeEventFilter *nativeEvent = Q_NULLPTR;
+    static FluApp* m_instance;
+    /**
+     * @brief appWindow
+     */
    QWindow *appWindow;
 };

--- a/src/FluColorSet.h
+++ b/src/FluColorSet.h
@ -4,9 +4,11 @@
 #include <QObject>
 #include "stdafx.h"

+/**
+ * @brief The FluColorSet class
+ */
 class FluColorSet : public QObject
 {
-
    Q_OBJECT
    Q_PROPERTY_AUTO(QString,darkest)
    Q_PROPERTY_AUTO(QString,darker)
@ -17,7 +19,6 @@ class FluColorSet : public QObject
    Q_PROPERTY_AUTO(QString,lightest)
 public:
    explicit FluColorSet(QObject *parent = nullptr);
-
 };

 #endif // FLUCOLORSET_H
--- a/src/FluColors.cpp
+++ b/src/FluColors.cpp
@ -1,5 +1,15 @@
 #include "FluColors.h"

+FluColors* FluColors::m_instance = nullptr;
+
+FluColors *FluColors::getInstance()
+{
+    if(FluColors::m_instance == nullptr){
+        FluColors::m_instance = new FluColors;
+    }
+    return FluColors::m_instance;
+}
+
 FluColors::FluColors(QObject *parent)
    : QObject{parent}
 {
--- a/src/FluColors.h
+++ b/src/FluColors.h
@ -6,6 +6,9 @@
 #include "FluColorSet.h"
 #include "stdafx.h"

+/**
+ * @brief The FluColors class
+ */
 class FluColors : public QObject
 {
    Q_OBJECT
@ -33,7 +36,6 @@ class FluColors : public QObject
    Q_PROPERTY_AUTO(QString,Grey200);
    Q_PROPERTY_AUTO(QString,Grey210);
    Q_PROPERTY_AUTO(QString,Grey220);
-
    Q_PROPERTY_AUTO(FluColorSet*,Yellow);
    Q_PROPERTY_AUTO(FluColorSet*,Orange);
    Q_PROPERTY_AUTO(FluColorSet*,Red);
@ -44,8 +46,15 @@ class FluColors : public QObject
    Q_PROPERTY_AUTO(FluColorSet*,Green);
    QML_NAMED_ELEMENT(FluColors)
    QML_SINGLETON
-public:
+private:
    explicit FluColors(QObject *parent = nullptr);
+    static FluColors* m_instance;
+public:
+    static FluColors *getInstance();
+    static FluColors *create(QQmlEngine *qmlEngine, QJSEngine *jsEngine)
+    {
+        return getInstance();
+    }
 };

 #endif // FLUCOLORS_H
--- a/src/FluRegister.cpp
+++ b/src/FluRegister.cpp
@ -12,7 +12,7 @@ FluRegister::FluRegister(QObject *parent)
 }

 void FluRegister::launch(const QJsonObject& argument){
-    FluApp::fluApp->navigate(path(),argument,this);
+    FluApp::getInstance()->navigate(path(),argument,this);
 }

 void FluRegister::onResult(const QJsonObject& data){
--- a/src/FluRegister.h
+++ b/src/FluRegister.h
@ -6,6 +6,9 @@
 #include <QJsonObject>
 #include "stdafx.h"

+/**
+ * @brief The FluRegister class
+ */
 class FluRegister : public QObject
 {
    Q_OBJECT
@ -15,8 +18,22 @@ class FluRegister : public QObject
 public:
    explicit FluRegister(QObject *parent = nullptr);

+    /**
+     * @brief launch 窗口跳转
+     * @param argument 跳转携带参数
+     */
    Q_INVOKABLE void launch(const QJsonObject& argument  = {});
+
+    /**
+     * @brief onResult 将结果数据回传到上一个窗口
+     * @param data 结果数据
+     */
    Q_INVOKABLE void onResult(const QJsonObject& data  = {});
+
+    /**
+     * @brief result 收到结果数据的信号
+     * @param data 结果数据
+     */
    Q_SIGNAL void result(const QJsonObject& data);

 };
--- a/src/FluTextStyle.cpp
+++ b/src/FluTextStyle.cpp
@ -0,0 +1,38 @@
+#include "FluTextStyle.h"
+
+FluTextStyle::FluTextStyle(QObject *parent)
+    : QObject{parent}
+{
+    QFont caption;
+    caption.setPixelSize(12);
+    Caption(caption);
+
+    QFont body;
+    body.setPixelSize(14);
+    Body(body);
+
+    QFont bodyStrong;
+    bodyStrong.setPixelSize(14);
+    bodyStrong.setBold(true);
+    BodyStrong(bodyStrong);
+
+    QFont subtitle;
+    subtitle.setPixelSize(20);
+    subtitle.setBold(true);
+    Subtitle(subtitle);
+
+    QFont title;
+    title.setPixelSize(28);
+    title.setBold(true);
+    Title(title);
+
+    QFont titleLarge;
+    titleLarge.setPixelSize(40);
+    titleLarge.setBold(true);
+    TitleLarge(titleLarge);
+
+    QFont display;
+    display.setPixelSize(68);
+    display.setBold(true);
+    Display(display);
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
zhuzihcu	3eeaae24db	update	2023-05-19 13:50:06 +08:00
zhuzihcu	e67e7e4d3b	update	2023-05-19 09:19:52 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	d5ca61c0f6	update	2023-05-19 08:03:37 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	15f90471dc	update	2023-05-19 07:57:23 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	2129301cd2	update	2023-05-18 23:33:31 +08:00
朱子楚	6366651453	update	2023-05-18 23:27:11 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	8480267127	update	2023-05-18 23:24:53 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	9adc63b3bc	update	2023-05-18 22:58:35 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	0003f8192e	update	2023-05-18 20:57:57 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	1491abc614	update	2023-05-18 20:32:53 +08:00
zhuzihcu	edd1ea90b9	update	2023-05-18 15:19:39 +08:00
zhuzihcu	4aba260eb5	update	2023-05-18 15:09:07 +08:00
zhuzihcu	8668db1587	update	2023-05-18 15:03:34 +08:00
zhuzihcu	56681cb5a3	update	2023-05-18 14:55:28 +08:00
zhuzihcu	ab68770d63	update	2023-05-18 09:40:07 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	594c0222a2	update	2023-05-17 22:51:33 +08:00
zhuzichu	2fb322536e	Merge pull request #113 from mentalfl0w/dev Fix the _systemDark don't get system color while app first boot.	2023-05-17 22:49:13 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	71d3af6d49	update	2023-05-17 22:46:02 +08:00
Mentalflow	323927c3ae	Fix the _systemDark don't get system color while app first boot.	2023-05-17 22:44:38 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	30c99c0907	update	2023-05-17 22:44:35 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	d488ca481c	update	2023-05-17 22:43:46 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	3232ae9a7c	Merge branch 'main' of https://github.com/zhuzichu520/FluentUI	2023-05-17 22:43:08 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	0da8d18467	update	2023-05-17 22:43:00 +08:00
朱子楚	8b531e4637	update	2023-05-17 22:26:16 +08:00
朱子楚	bd422f96cf	update	2023-05-17 22:19:46 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	155960c15b	update	2023-05-17 22:02:09 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	1601b64883	update	2023-05-17 21:27:00 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	5539c59233	update	2023-05-17 21:21:23 +08:00
zhuzichu	4b2cbb542e	Merge pull request #112 from mentalfl0w/dev Fix the blur background in T_Home.qml	2023-05-17 20:46:20 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	b36ceed119	update	2023-05-17 20:43:26 +08:00
Mentalflow	1129a935eb	Fix the blur background in T_Home.qml	2023-05-17 20:34:04 +08:00
朱子楚	1446fd8933	update	2023-05-17 20:20:29 +08:00
zhuzichu	4e4760e37f	Merge pull request #111 from mentalfl0w/dev Improve FluAcrylic.	2023-05-17 19:57:14 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	f365e08fb2	update	2023-05-17 19:52:33 +08:00
Mentalflow	c0b76e6282	Improve FluAcrylic.	2023-05-17 19:29:09 +08:00
zhuzihcu	ac0b0aaaa9	update	2023-05-17 18:24:11 +08:00
zhuzihcu	a89d36fd14	update	2023-05-17 18:15:15 +08:00
zhuzihcu	7d7cd4144c	update	2023-05-17 13:49:20 +08:00
zhuzihcu	68cf87dba9	update	2023-05-17 13:44:38 +08:00
zhuzichu	55e668e95e	Update README.md	2023-05-17 12:58:13 +08:00
zhuzihcu	e1889f7572	update	2023-05-17 12:56:35 +08:00
zhuzihcu	bcb862e316	update	2023-05-17 12:54:08 +08:00
zhuzihcu	b93f91a73f	update	2023-05-17 12:49:41 +08:00
zhuzihcu	09dd381bbc	update	2023-05-17 11:42:03 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	09fa471a10	update	2023-05-16 21:09:37 +08:00
zhuzihcu	fb48ed543b	update	2023-05-16 12:49:20 +08:00
zhuzichu	b8179f0df4	Update README.md	2023-05-16 09:47:50 +08:00
zhuzichu	1dd09ef676	Update README.md	2023-05-16 09:47:12 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	bc6041b5a4	update	2023-05-15 21:32:15 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	75193b216f	update	2023-05-15 21:14:37 +08:00
zhuzichu	c095008042	Merge pull request #105 from parker-int64/test_branch Test branch - Fixed the path of README_zh_CN.md	2023-05-15 18:00:26 +08:00
parker-int64	128bb94742	changed display text and recapture the screenshots	2023-05-15 17:48:09 +08:00
parker-int64	684cf47101	Fixed the wrong path.	2023-05-15 16:38:52 +08:00
zhuzichu	65f0dc2e55	Merge pull request #103 from parker-int64/test_branch Test branch: Add Eng to README.md	2023-05-15 16:32:21 +08:00
parker-int64	0c4ff01732	add some additional pics	2023-05-15 16:07:07 +08:00
parker-int64	48333a2bcc	move the original README to README_zh_CN, new README in Eng.	2023-05-15 16:06:43 +08:00
zhuzichu	3e5d64f086	Merge pull request #100 from mentalfl0w/dev Improve FluAcrylic.	2023-05-15 00:08:00 +08:00
Mentalflow	63354f2d8d	Improve FluAcrylic.	2023-05-14 22:58:31 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	bf5a4ef4f5	update	2023-05-14 20:28:41 +08:00
zhuzichu	ea04380bd5	Merge pull request #99 from mentalfl0w/dev Add PageMode for FluNavigationView.	2023-05-14 19:26:03 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	0c7fa3e5bb	update	2023-05-14 19:06:10 +08:00
Mentalflow	57fa166da3	Add PageMode for FluNavigationView.	2023-05-14 18:31:17 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	87a1e4744c	update	2023-05-14 16:54:13 +08:00
zhuzichu	308e2407c3	Merge pull request #98 from mentalfl0w/dev Use Qt6 compatible blur effect.	2023-05-14 14:17:20 +08:00
Mentalflow	74afdeaf49	Use Qt6 compatible blur effect.	2023-05-14 13:05:06 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	84e863f664	update	2023-05-13 17:56:26 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	8475ec7f03	update	2023-05-13 17:30:07 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	fdcf2de3ee	update	2023-05-13 00:20:12 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	a648b683d9	update	2023-05-12 22:22:55 +08:00
zhuzihcu	e1c6c04013	update	2023-05-12 19:26:49 +08:00
zhuzihcu	0c19164c54	update	2023-05-12 10:40:27 +08:00
zhuzichu	86790c9562	Merge pull request #94 from runhey/main FluProgressRing可以修改大小	2023-05-11 22:34:31 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	b784f70479	update	2023-05-11 21:36:34 +08:00
huangrunheng	4bd6712782	Merge branch 'zhuzichu520:main' into main	2023-05-11 21:19:34 +08:00
runhey	8668e39446	fix: FluProgressRing可以修改大小	2023-05-11 21:18:34 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	a0dae17117	update	2023-05-11 20:10:42 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	0a1c6d54bc	update	2023-05-11 18:51:44 +08:00
zhuzihcu	f8146f24ea	update	2023-05-11 18:24:58 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	dd16b4703d	update	2023-05-10 20:09:32 +08:00
zhuzihcu	7d5fcc6e47	update	2023-05-10 10:32:37 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	9c843a7157	update	2023-05-10 00:27:53 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	e4accb8064	update	2023-05-09 22:35:55 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	747d18364b	update	2023-05-09 20:30:52 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	cb85f10758	update	2023-05-09 19:58:41 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	88cae89f31	update	2023-05-09 19:52:35 +08:00
zhuzihcu	a14e502abd	update	2023-05-09 18:31:59 +08:00
zhuzihcu	b20046c0a9	Merge branch 'main' of https://github.com/zhuzichu520/FluentUI	2023-05-09 17:18:10 +08:00
zhuzihcu	b5c0ec50a8	update	2023-05-09 17:17:57 +08:00
zhuzichu	8281fa1e9d	Merge pull request #87 from mentalfl0w/dev Let the pagination can be manually adjusted in FluTableView.	2023-05-09 13:52:32 +08:00
Mentalflow	26e9b5d298	Let the pagination can be manually adjusted in FluTableView.	2023-05-09 10:57:11 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	eaad0dc565	update	2023-05-06 00:08:04 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	9a494e938c	update	2023-05-05 23:54:10 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	ad35ac2588	update	2023-05-05 23:05:07 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	c81910a41f	update	2023-05-05 22:46:54 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	cff6aaf6f4	update	2023-05-05 22:45:02 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	a1c8672a5a	update	2023-05-05 21:58:39 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	df5e657ad1	update	2023-05-05 21:42:16 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	fb4ed03530	update	2023-05-05 18:51:40 +08:00
zhuzichu	7ceb4f27a3	Merge pull request #83 from mentalfl0w/dev Make the library compile as Universal Library in macOS.	2023-05-04 08:23:58 +08:00
Mentalflow	292e96cdfd	Make the library compile as Universal Library in macOS.	2023-05-04 00:22:20 +08:00
zhuzichu	c925ab79c6	Merge pull request #81 from mentalfl0w/dev Allow the table to set the maximum height of each row based on the content.	2023-04-30 14:52:01 +08:00
Mentalflow	f51d9f960b	Allow the table to set the maximum height of each row based on the content.	2023-04-30 13:50:51 +08:00
zhuzihcu	86fa76edee	update	2023-04-28 23:44:32 +08:00
zhuzichu	4222597ef0	Merge pull request #76 from mentalfl0w/dev Added ToolTip for FluTabView's tab.	2023-04-27 18:18:24 +08:00
Mentalflow	a3adedf164	Added ToolTip for FluTabView's tab.	2023-04-27 18:06:01 +08:00
zhuzihcu	a70ddf7087	update	2023-04-27 17:29:39 +08:00
zhuzihcu	afeb6daea5	update	2023-04-27 15:43:45 +08:00
zhuzihcu	a258d429c2	Merge branch 'main' of https://github.com/zhuzichu520/FluentUI	2023-04-27 14:30:46 +08:00
zhuzihcu	7a25a48fdb	update	2023-04-27 14:30:10 +08:00
zhuzichu	0e434a36e7	Update README.md	2023-04-27 10:25:40 +08:00
zhuzichu	36561fd75a	Update README.md	2023-04-27 10:24:09 +08:00