update

add tag name into workflow release assets

.github/workflows/macos.yml

@@ -16,24 +16,23 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-11.0]
+        os: [macos-12]
         qt_ver: [6.4.3]
         qt_arch: [clang_64]
     env:
       targetName: example
     steps:
-      # macos 11.0 默认环境变了,要指定
+      - name: '⚙️ Cache Qt'
-      - name: prepare env
+        id: cache-qt
-        if: ${{ matrix.os == 'macos-11.0' }}
+        uses: actions/cache@v3
-        run: |
+        with:
-          softwareupdate --all --install --force
+          path: ${{ runner.workspace }}/Qt
-          sudo xcode-select --print-path
+          key: ${{runner.os}}-qtcachedir-${{ matrix.qt_ver }}
-          sudo xcode-select --switch /Library/Developer/CommandLineTools       
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt_ver }}
-          cached: 'false'
+          cache: ${{steps.cache-qt.outputs.cache-hit}}
           arch: ${{ matrix.qt_arch }}
           modules: 'qt5compat qtmultimedia qtshadertools qtimageformats'
       - uses: actions/checkout@v2
@@ -60,6 +59,6 @@ jobs:
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: bin/release/${{ env.targetName }}.dmg
-          asset_name: ${{ env.targetName }}_${{ matrix.os }}_${{ matrix.qt_ver }}.dmg
+          asset_name: ${{ env.targetName }}_${{  github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}.dmg
           tag: ${{ github.ref }}
           overwrite: true

.github/workflows/ubuntu.yml

@@ -24,11 +24,17 @@ jobs:
     env:
       targetName: example
     steps:
+      - name: '⚙️ Cache Qt'
+        id: cache-qt
+        uses: actions/cache@v3
+        with:
+          path: ${{ runner.workspace }}/Qt
+          key: ${{runner.os}}-qtcachedir-${{ matrix.qt_ver }}
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt_ver }}
-          cached: 'false'
+          cache: ${{steps.cache-qt.outputs.cache-hit}}
           arch: ${{ matrix.qt_arch }}
           modules: 'qt5compat qtmultimedia qtshadertools qtimageformats'
       - name: ubuntu install GL library
@@ -44,6 +50,8 @@ jobs:
         uses: miurahr/install-linuxdeploy-action@v1
         with:
           plugins: qt appimage
+      - name: Check if svg file exists
+        run: if [ ! -f "${targetName}.svg" ]; then echo "File not found, creating..."; touch ${targetName}.svg; fi
       # 打包
       - name: package
         run: |
@@ -64,6 +72,6 @@ jobs:
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ env.targetName }}.AppImage
-          asset_name: ${{ env.targetName }}_${{ matrix.os }}_${{ matrix.qt_ver }}.AppImage
+          asset_name: ${{ env.targetName }}_${{  github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}.AppImage
           tag: ${{ github.ref }}
           overwrite: true

.github/workflows/windows-mingw.yml

@@ -0,0 +1,76 @@
+name: Windows MinGW
+on: 
+  push:
+    paths:
+      - '*.pro'
+      - 'src/**'
+      - '.github/workflows/windows-mingw.yml'
+  pull_request:
+    paths:
+      - '*.pro'
+      - 'src/**'
+      - '.github/workflows/windows-mingw.yml' 
+jobs:
+  build:
+    name: Build
+    runs-on: windows-2022
+    strategy:
+      matrix:
+        include:
+          - qt_arch: win64_mingw
+            qt_ver: 6.4.3
+            qt_tools: "tools_mingw,9.0.0-1-202203221220,qt.tools.win64_mingw900"
+            qt_tools_mingw_install: mingw900_64
+    env:
+      targetName: example.exe
+      fileName: example
+    steps:
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: ${{ matrix.qt_ver }}
+          arch: ${{ matrix.qt_arch }}
+          cache: ${{steps.cache-qt.outputs.cache-hit}}
+          modules: 'qt5compat qtmultimedia qtshadertools qtimageformats'
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
+      - name: Qt6 environment configuration
+        if: ${{ startsWith( matrix.qt_ver, 6 ) }}
+        shell: pwsh
+        run: |
+          Write-Output "${{ env.Qt6_DIR }}/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          Write-Output "${{ env.Qt6_DIR }}/../../Tools/${{ matrix.qt_tools_mingw_install }}/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+      - name: where is qmake & where is mingw32-make
+        shell: pwsh
+        run: |
+          Get-Command -Name 'qmake' | Format-List
+          Get-Command -Name 'mingw32-make' | Format-List
+      - name: mingw-build
+        id: build
+        shell: cmd
+        run: |
+          qmake
+          mingw32-make
+      - name: package
+        id: package      
+        env:
+          archiveName: ${{ env.fileName }}-${{ matrix.qt_arch }}-${{ matrix.qt_ver }}
+        shell: pwsh
+        run: |
+          & scripts\windows-mingw-publish.ps1 ${env:archiveName} ${env:targetName}
+           $name = ${env:archiveName}
+           echo "::set-output name=packageName::$name"       
+      - uses: actions/upload-artifact@v2
+        with:
+          name: ${{ steps.package.outputs.packageName }}
+          path: ${{ steps.package.outputs.packageName }}
+      - name: uploadRelease
+        if: startsWith(github.event.ref, 'refs/tags/')
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.package.outputs.packageName }}.zip
+          asset_name: ${{ env.fileName }}_${{  github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}.zip
+          tag: ${{ github.ref }}
+          overwrite: true 

.github/workflows/windows.yml

@@ -16,10 +16,11 @@ jobs:
     name: Build
     # 运行平台， windows-latest目前是windows server 2019 
     # 参考文档 https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md
-    runs-on: windows-2019
+    runs-on: ${{ matrix.os }}
     strategy:
       # 矩阵配置
       matrix:
+        os: [windows-2019]
         include:
           - qt_ver: 6.4.3          
             qt_arch: win64_msvc2019_64
@@ -30,6 +31,12 @@ jobs:
       fileName: example
     # 步骤
     steps:
+      - name: '⚙️ Cache Qt'
+        id: cache-qt
+        uses: actions/cache@v3
+        with:
+          path: ${{ runner.workspace }}\Qt
+          key: ${{runner.os}}-qtcachedir-${{ matrix.qt_ver }}
       # 安装Qt
       - name: Install Qt
         # 使用外部action。这个action专门用来安装Qt
@@ -37,7 +44,7 @@ jobs:
         with:
           version: ${{ matrix.qt_ver }}
           arch: ${{ matrix.qt_arch }}
-          cached: 'false'
+          cache: ${{steps.cache-qt.outputs.cache-hit}}
           modules: 'qt5compat qtmultimedia qtshadertools qtimageformats'
       # 拉取代码
       - uses: actions/checkout@v2
@@ -80,6 +87,6 @@ jobs:
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.package.outputs.packageName }}.zip
-          asset_name: ${{ steps.package.outputs.packageName }}.zip
+          asset_name: ${{ env.fileName }}_${{  github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}.zip
           tag: ${{ github.ref }}
           overwrite: true 

CMakeLists.txt

@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
 project(FluentUI VERSION 0.1 LANGUAGES CXX)
+
 add_subdirectory(src)
 add_subdirectory(example)

example/CMakeLists.txt

@@ -7,6 +7,18 @@ set(CMAKE_AUTOUIC ON)
 
 set(CMAKE_CXX_STANDARD 17)
 
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(platform 64)
+else()
+  set(platform 32)
+endif()
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin/debug)
+else()
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin/release)
+endif()
+
 find_package(Qt6 COMPONENTS Core Quick QuickControls2 Concurrent Network Multimedia REQUIRED)
 
 set(SOURCES
@@ -28,21 +40,26 @@ set(RC_ICONS
 
 qt_add_resources(QT_RESOURCES ${RESOURCES})
 
-if(WIN32)
-    if(QT_ARCH EQUAL 32)
-        set(COPYDLL ${CMAKE_CURRENT_SOURCE_DIR}/../third/Win_x86/*.dll ${DESTDIR})
-    else()
-        set(COPYDLL ${CMAKE_CURRENT_SOURCE_DIR}/../third/Win_x64/*.dll ${DESTDIR})
-    endif()
-    if(QMAKE_CC STREQUAL "cl")
-        set(QMAKE_PRE_LINK "${QMAKE_COPY} ${COPYDLL}")
-    else()
-        set(QMAKE_PRE_LINK "${QMAKE_COPY} ${COPYDLL}")
-    endif()
-endif()
-
 add_executable(${PROJECT_NAME} ${SOURCES} ${HEADERS} ${QT_RESOURCES} ${RC_ICONS})
 
+if(WIN32)
+    if(platform EQUAL 32)
+        file(GLOB DLL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../third/Win_x86/*.dll)
+        add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy
+            ${DLL_FILES}
+            ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+        )
+    else()
+        file(GLOB DLL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../third/Win_x64/*.dll)
+        add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy
+            ${DLL_FILES}
+            ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+        )
+    endif()
+endif()
+
 target_compile_definitions(${PROJECT_NAME} PRIVATE
     QT_DEPRECATED_WARNINGS
     QT_NO_WARNING_OUTPUT

example/T_Awesome.qml

@@ -67,7 +67,6 @@ FluContentPage {
                 width:parent.width
                 wrapMode: Text.WrapAnywhere
                 text: modelData.name
-
                 horizontalAlignment: Text.AlignHCenter
             }
         }

example/T_Badge.qml

@@ -13,7 +13,7 @@ FluScrollablePage{
     bottomPadding:20
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 106
         paddings: 10

example/T_Buttons.qml

@@ -19,7 +19,7 @@ FluScrollablePage{
     }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 68
         paddings: 10
 
@@ -50,7 +50,7 @@ FluScrollablePage{
     }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 68
         paddings: 10
 
@@ -81,7 +81,7 @@ FluScrollablePage{
     }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 68
         paddings: 10
 
@@ -113,7 +113,7 @@ FluScrollablePage{
 
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 68
         paddings: 10
 
@@ -145,7 +145,7 @@ FluScrollablePage{
     }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 68
         paddings: 10
 
@@ -186,7 +186,7 @@ FluScrollablePage{
     }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 100
         paddings: 10
 
@@ -228,7 +228,7 @@ FluScrollablePage{
 
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 68
         paddings: 10
 
@@ -255,6 +255,4 @@ FluScrollablePage{
             }
         }
     }
-
-
 }

example/T_CalendarPicker.qml

@@ -12,7 +12,7 @@ FluScrollablePage{
     bottomPadding:20
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 350
         paddings: 10
@@ -21,7 +21,7 @@ FluScrollablePage{
     }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 80
         paddings: 10

example/T_Carousel.qml

@@ -12,7 +12,7 @@ FluScrollablePage{
     bottomPadding:20
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 370
         paddings: 10
         Layout.topMargin: 20

example/T_ColorPicker.qml

@@ -12,7 +12,7 @@ FluScrollablePage{
     bottomPadding:20
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 280
         Layout.topMargin: 20
         paddings: 10
@@ -39,7 +39,7 @@ FluScrollablePage{
     }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 60
         paddings: 10

example/T_DatePicker.qml

@@ -12,7 +12,7 @@ FluScrollablePage{
     bottomPadding:20
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 80
         paddings: 10
@@ -36,7 +36,7 @@ FluScrollablePage{
 
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 80
         paddings: 10

example/T_FlipView.qml

@@ -0,0 +1,78 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+
+FluScrollablePage{
+
+    title:"FlipView"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 340
+        paddings: 10
+        Layout.topMargin: 20
+        ColumnLayout{
+            anchors.verticalCenter: parent.verticalCenter
+            FluText{
+                text:"水平方向的FlipView"
+            }
+            FluFlipView{
+                Image{
+                    source: "qrc:/res/image/banner_1.jpg"
+                    asynchronous: true
+                    sourceSize: Qt.size(400,300)
+                    fillMode:Image.PreserveAspectCrop
+                }
+                Image{
+                    source: "qrc:/res/image/banner_2.jpg"
+                    asynchronous: true
+                    fillMode:Image.PreserveAspectCrop
+                }
+                Image{
+                    source: "qrc:/res/image/banner_3.jpg"
+                    asynchronous: true
+                    fillMode:Image.PreserveAspectCrop
+                }
+            }
+        }
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 340
+        paddings: 10
+        Layout.topMargin: 20
+        ColumnLayout{
+            anchors.verticalCenter: parent.verticalCenter
+            FluText{
+                text:"垂直方向的FlipView"
+            }
+            FluFlipView{
+                vertical:true
+                Image{
+                    source: "qrc:/res/image/banner_1.jpg"
+                    asynchronous: true
+                    sourceSize: Qt.size(400,300)
+                    fillMode:Image.PreserveAspectCrop
+                }
+                Image{
+                    source: "qrc:/res/image/banner_2.jpg"
+                    asynchronous: true
+                    fillMode:Image.PreserveAspectCrop
+                }
+                Image{
+                    source: "qrc:/res/image/banner_3.jpg"
+                    asynchronous: true
+                    fillMode:Image.PreserveAspectCrop
+                }
+            }
+        }
+    }
+
+}

example/T_MediaPlayer.qml

@@ -20,7 +20,7 @@ FluScrollablePage{
     }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 320
         Layout.topMargin: 20
         paddings: 10
@@ -37,7 +37,7 @@ FluScrollablePage{
     }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 68
         Layout.topMargin: 20
         paddings: 10

example/T_MultiWindow.qml

@@ -24,7 +24,7 @@ FluScrollablePage{
     }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 100
         paddings: 10
         Layout.topMargin: 20
@@ -48,7 +48,7 @@ FluScrollablePage{
     }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 130
         paddings: 10
         Layout.topMargin: 20
@@ -75,6 +75,4 @@ FluScrollablePage{
         }
     }
 
-
-
 }

example/T_Pivot.qml

@@ -0,0 +1,51 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+
+FluScrollablePage{
+
+    title:"Pivot"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+
+
+    FluArea{
+        Layout.fillWidth: true
+        Layout.topMargin: 20
+        height: 400
+        paddings: 10
+
+        FluPivot{
+            anchors.fill: parent
+            FluPivotItem{
+                title:"All"
+                contentItem:FluText{
+                    text:"All emails go here."
+                }
+            }
+            FluPivotItem{
+                title:"Unread"
+                contentItem:FluText{
+                    text:"Unread emails go here."
+                }
+            }
+            FluPivotItem{
+                title:"Flagged"
+                contentItem:FluText{
+                    text:"Flagged emails go here."
+                }
+            }
+            FluPivotItem{
+                title:"Urgent"
+                contentItem:FluText{
+                    text:"Urgent emails go here."
+                }
+            }
+        }
+    }
+
+
+}

example/T_TabView.qml

@@ -32,7 +32,7 @@ FluScrollablePage{
     }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 50
         paddings: 10
@@ -98,7 +98,7 @@ FluScrollablePage{
     }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 5
         height: 400
         paddings: 10

example/T_TimePicker.qml

@@ -12,7 +12,7 @@ FluScrollablePage{
     bottomPadding:20
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 80
         paddings: 10
@@ -36,7 +36,7 @@ FluScrollablePage{
 
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 80
         paddings: 10

example/T_Tooltip.qml

@@ -18,7 +18,7 @@ FluScrollablePage{
 
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 68
         paddings: 10
@@ -44,7 +44,7 @@ FluScrollablePage{
     }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 68
         paddings: 10

example/example.pro

@@ -25,18 +25,10 @@ CONFIG(debug,debug|release) {
 win32 {
 contains(QT_ARCH, i386) {
     COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/Win_x86/*.dll) $$DESTDIR
-    contains(QMAKE_CC, cl) {
+    QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, $$QMAKE_DIR_SEP)
-        QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, \\)
-    } else {
-        QMAKE_PRE_LINK += $$QMAKE_COPY $$COPYDLL
-    }
 } else {
     COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/Win_x64/*.dll) $$DESTDIR
-    contains(QMAKE_CC, cl) {
+    QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, $$QMAKE_DIR_SEP)
-        QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, \\)
-    } else {
-        QMAKE_PRE_LINK += $$QMAKE_COPY $$COPYDLL
-    }
 }
 }
 

example/global/ItemsOriginal.qml

@@ -172,10 +172,22 @@ FluObject{
     FluPaneItemExpander{
         title:"Navigation"
         icon:FluentIcons.AllApps
+
+        FluPaneItem{
+            title:"Pivot"
+            image:"qrc:/res/image/control/Pivot.png"
+            recentlyAdded:true
+            order:3
+            desc:"Presents information from different sources in atabbed view."
+            onTap:{
+                navigationView.push("qrc:/T_Pivot.qml")
+            }
+        }
         FluPaneItem{
             title:"TabView"
             image:"qrc:/res/image/control/TabView.png"
             recentlyAdded:true
+            order:1
             desc:"A control that displays a collection of tabs thatcan be used to display several documents."
             onTap:{
                 navigationView.push("qrc:/T_TabView.qml")
@@ -187,15 +199,23 @@ FluObject{
                 navigationView.push("qrc:/T_TreeView.qml")
             }
         }
-
         FluPaneItem{
             title:"MultiWindow"
             onTap:{
                 navigationView.push("qrc:/T_MultiWindow.qml")
             }
         }
+        FluPaneItem{
+            title:"FlipView"
+            image:"qrc:/res/image/control/FlipView.png"
+            recentlyAdded:true
+            order:2
+            desc:"Presents a collection of items that the user canflip through, one item at a time."
+            onTap:{
+                navigationView.push("qrc:/T_FlipView.qml")
+            }
+        }
     }
-
 
     FluPaneItemExpander{
         title:"Theming"
@@ -228,6 +248,7 @@ FluObject{
             title:"MediaPlayer"
             image:"qrc:/res/image/control/MediaPlayerElement.png"
             recentlyAdded:true
+            order:0
             desc:"A control to display video and image content."
             onTap:{
                 navigationView.push("qrc:/T_MediaPlayer.qml")
@@ -251,6 +272,7 @@ FluObject{
                 }
             }
         }
+        arr.sort(function(o1,o2){ return o2.order-o1.order })
         return arr
     }
 

example/page/AboutPage.qml

@@ -36,7 +36,7 @@ FluWindow {
                 fontStyle: FluText.Title
             }
             FluText{
-                text:"v1.1.8"
+                text:"v1.1.9"
                 fontStyle: FluText.Body
                 Layout.alignment: Qt.AlignBottom
             }

example/qml.qrc

@@ -153,5 +153,7 @@
         <file>global/qmldir</file>
         <file>global/ItemsFooter.qml</file>
         <file>page/MediaPage.qml</file>
+        <file>T_FlipView.qml</file>
+        <file>T_Pivot.qml</file>
     </qresource>
 </RCC>

scripts/windows-mingw-publish.ps1

@@ -0,0 +1,34 @@
+[CmdletBinding()]
+param (
+    [string] $archiveName, [string] $targetName
+)
+# 外部环境变量包括:
+# archiveName: ${{ matrix.qt_ver }}-${{ matrix.qt_arch }}
+
+
+# archiveName: 5.15.2-win64_mingw81
+
+$scriptDir = $PSScriptRoot
+$currentDir = Get-Location
+Write-Host "currentDir" $currentDir
+Write-Host "scriptDir" $scriptDir
+
+function Main() {
+
+    New-Item -ItemType Directory $archiveName
+    # 拷贝exe
+    Copy-Item bin\release\* $archiveName\
+    # 拷贝依赖
+    windeployqt --qmldir . --plugindir $archiveName\plugins --no-translations --compiler-runtime $archiveName\$targetName
+    # 删除不必要的文件
+    $excludeList = @("*.qmlc", "*.ilk", "*.exp", "*.lib", "*.pdb")
+    Remove-Item -Path $archiveName -Include $excludeList -Recurse -Force
+    # 打包zip
+    Compress-Archive -Path $archiveName $archiveName'.zip'
+}
+
+if ($null -eq $archiveName || $null -eq $targetName) {
+    Write-Host "args missing, archiveName is" $archiveName ", targetName is" $targetName
+    return
+}
+Main

src/CMakeLists.txt

@@ -45,12 +45,13 @@ else()
     set(TARGET_SOURCES ${TARGET_SOURCES} FramelessView_unix.cpp)
 endif()
 
+add_definitions(-DVERSION_IN="1.0.0")
+add_definitions(-DVURI_STR="FluentUI")
+
 add_library(${PROJECT_NAME} ${TARGET_TYPE} ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESOURCES})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/FluentUI)
 
-target_compile_definitions(${PROJECT_NAME} PRIVATE VERSION_IN=\\\"1.0.0\\\" URI_STR=\\\"FluentUI\\\")
-
 if(WIN32)
     target_link_libraries(${PROJECT_NAME} PRIVATE dwmapi user32)
 else()

src/Fluent.cpp

@@ -22,7 +22,7 @@ Fluent *Fluent::getInstance()
 
 QString Fluent::version() const
 {
-    return QStringLiteral("1.0.0");
+    return QStringLiteral(VERSION_IN);
 }
 
 void Fluent::registerTypes(const char *uri){
@@ -33,6 +33,9 @@ void Fluent::registerTypes(const char *uri){
     qmlRegisterType<WindowHelper>(uri,major,minor,"WindowHelper");
     qmlRegisterType<FluColorSet>(uri,major,minor,"FluColorSet");
 
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPivotItem.qml"),uri,major,minor,"FluPivotItem");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPivot.qml"),uri,major,minor,"FluPivot");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluFlipView.qml"),uri,major,minor,"FluFlipView");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPaneItemExpander.qml"),uri,major,minor,"FluPaneItemExpander");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluTabView.qml"),uri,major,minor,"FluTabView");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluArea.qml"),uri,major,minor,"FluArea");

src/build_windows.pri

@@ -1,25 +1,17 @@
 OUTP = $$OUT_PWD/../bin/FluentUI
 BUILDBIN_PATH = $$replace(OUTP, src/../bin, bin)
-message("----------------->")
-message($$OUTP)
-message($$BUILDBIN_PATH)
 QTQMLFLUENT_PATH = $$[QT_INSTALL_QML]/FluentUI
 PRESET_PATH = $$PWD/build-preset
 SOLIBFILE_PATH = $$OUT_PWD/libFluentUI.so
 ANDROID = NO
-
 android{
     ANDROID=YES
     QMAKE_PRE_LINK *= md $$replace(OUTP, /, \\)
 }else{
     DESTDIR += $$OUTP
 }
-
 SHAREDSCRIPT = "$$PWD\win_install.bat" SHARED "$$PWD" "$$PRESET_PATH" "$$BUILDBIN_PATH" "$$QTQMLFLUENT_PATH" $$ANDROID "$$SOLIBFILE_PATH"
 STATICSCRIPT = "$$PWD\win_install.bat" STATIC "$$PWD" "$$PRESET_PATH" "$$BUILDBIN_PATH" "$$QTQMLFLUENT_PATH" $$ANDROID "$$SOLIBFILE_PATH"
-
-message("-------------------------")
-message($$SHAREDSCRIPT)
 CONFIG(sharedlib){
     QMAKE_POST_LINK *= $$replace(SHAREDSCRIPT, /, \\)
 }

src/controls/FluAppBar.qml

@@ -93,7 +93,7 @@ Rectangle{
             iconSize: 11
             text:minimizeText
             radius: 0
-            textColor: root.textColor
+            iconColor: root.textColor
             color: hovered ? minimizeHoverColor : minimizeNormalColor
             onClicked: {
                 d.win.showMinimized()
@@ -107,7 +107,7 @@ Rectangle{
             Layout.alignment: Qt.AlignVCenter
             visible: d.resizable
             radius: 0
-            textColor: root.textColor
+            iconColor: root.textColor
             text:d.isRestore?restoreText:maximizeText
             iconSize: 11
             onClicked: {
@@ -122,7 +122,7 @@ Rectangle{
             height: 30
             radius: 0
             iconSize: 10
-            textColor: hovered ? Qt.rgba(1,1,1,1) : root.textColor
+            iconColor: hovered ? Qt.rgba(1,1,1,1) : root.textColor
             color:hovered ? closeHoverColor : closeNormalColor
             onClicked: {
                 d.win.close()

src/controls/FluAutoSuggestBox.qml

@@ -2,133 +2,20 @@
 import QtQuick.Controls
 import FluentUI
 
-TextField{
+FluTextBox{
-
     property var items:[]
-    property int fontStyle: FluText.Body
     property string emptyText: "没有找到结果"
-    property int pixelSize : FluTheme.textSize
-    property int iconSource: 0
-    property bool disabled: false
     signal itemClicked(var data)
     signal handleClicked
-    property color normalColor: FluTheme.dark ?  Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)
-    property color disableColor: FluTheme.dark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
-    property color placeholderNormalColor: FluTheme.dark ? Qt.rgba(210/255,210/255,210/255,1) : Qt.rgba(96/255,96/255,96/255,1)
-    property color placeholderFocusColor: FluTheme.dark ? Qt.rgba(152/255,152/255,152/255,1) : Qt.rgba(141/255,141/255,141/255,1)
-    property color placeholderDisableColor: FluTheme.dark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
     QtObject{
         id:d
         property bool flagVisible: true
     }
     id:control
     width: 300
-    enabled: !disabled
-    color: {
-        if(disabled){
-            return disableColor
-        }
-        return normalColor
-    }
-    selectionColor: FluTheme.primaryColor.lightest
-    renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
-    placeholderTextColor: {
-        if(disabled){
-            return placeholderDisableColor
-        }
-        if(focus){
-            return placeholderFocusColor
-        }
-        return placeholderNormalColor
-    }
-    rightPadding: icon_right.visible ? 50 : 30
-    selectByMouse: true
-    Keys.onUpPressed: {
-        list_view.currentIndex = Math.max(list_view.currentIndex-1,0)
-    }
-    Keys.onDownPressed: {
-        list_view.currentIndex = Math.min(list_view.currentIndex+1,list_view.count-1)
-    }
-    Keys.onEnterPressed:handleClicked()
-    Keys.onReturnPressed:handleClicked()
-    font.bold: {
-        switch (fontStyle) {
-        case FluText.Display:
-            return true
-        case FluText.TitleLarge:
-            return true
-        case FluText.Title:
-            return true
-        case FluText.SubTitle:
-            return true
-        case FluText.BodyStrong:
-            return true
-        case FluText.Body:
-            return false
-        case FluText.Caption:
-            return false
-        default:
-            return false
-        }
-    }
-    font.pixelSize: {
-        switch (fontStyle) {
-        case FluText.Display:
-            return text.pixelSize * 4.857
-        case FluText.TitleLarge:
-            return text.pixelSize * 2.857
-        case FluText.Title:
-            return text.pixelSize * 2
-        case FluText.SubTitle:
-            return text.pixelSize * 1.428
-        case FluText.Body:
-            return text.pixelSize * 1.0
-        case FluText.BodyStrong:
-            return text.pixelSize * 1.0
-        case FluText.Caption:
-            return text.pixelSize * 0.857
-        default:
-            return text.pixelSize * 1.0
-        }
-    }
-
-    FluIconButton{
-        iconSource:FluentIcons.ChromeClose
-        iconSize: 10
-        width: 20
-        height: 20
-        opacity: 0.5
-        visible: control.text !== ""
-        anchors{
-            verticalCenter: parent.verticalCenter
-            right: parent.right
-            rightMargin: icon_right.visible ? 25 : 5
-        }
-        onClicked:{
-            control.text = ""
-        }
-    }
-
-    background: FluTextBoxBackground{
-        inputItem: control
-        FluIcon{
-            id:icon_right
-            iconSource: control.iconSource
-            iconSize: 15
-            opacity: 0.5
-            visible: control.iconSource != 0
-            anchors{
-                verticalCenter: parent.verticalCenter
-                right: parent.right
-                rightMargin: 5
-            }
-        }
-    }
-
     Component.onCompleted: {
         loadData()
     }
-
     Popup{
         id:control_popup
         y:control.height
@@ -269,4 +156,3 @@ TextField{
     }
 
 }
-

src/controls/FluFlipView.qml

@@ -0,0 +1,116 @@
+import QtQuick
+import QtQuick.Controls
+import FluentUI
+
+Item{
+
+    property bool vertical: false
+    default property alias content : swipe.contentData
+    property alias currentIndex: swipe.currentIndex
+
+    id:control
+    width: 400
+    height: 300
+    implicitWidth: width
+    implicitHeight: height
+
+    QtObject{
+        id:d
+        property bool flag: true
+    }
+
+    MouseArea{
+        anchors.fill: parent
+        preventStealing: true
+        onWheel:
+            (wheel)=>{
+                if(!d.flag)
+                return
+                if (wheel.angleDelta.y > 0){
+                    btn_start.clicked()
+                }else{
+                    btn_end.clicked()
+                }
+                d.flag = false
+                timer.restart()
+            }
+    }
+
+    Timer{
+        id:timer
+        interval: 250
+        onTriggered: {
+            d.flag = true
+        }
+    }
+
+    SwipeView {
+        id:swipe
+        clip: true
+        interactive: false
+        orientation:control.vertical ? Qt.Vertical : Qt.Horizontal
+        anchors.fill: parent
+    }
+
+    Button{
+        id:btn_start
+        height: vertical ? 20 : 40
+        width: vertical ? 40 : 20
+        anchors{
+            left: vertical ? undefined : parent.left
+            leftMargin: vertical ? undefined : 2
+            verticalCenter: vertical ? undefined : parent.verticalCenter
+            horizontalCenter: !vertical ? undefined : parent.horizontalCenter
+            top: !vertical ? undefined :parent.top
+            topMargin: !vertical ? undefined :2
+        }
+        background: Rectangle{
+            radius: 4
+            color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,0.97) : Qt.rgba(237/255,237/255,237/255,0.97)
+        }
+        contentItem:FluIcon{
+            iconSource: vertical ? FluentIcons.CaretUpSolid8 : FluentIcons.CaretLeftSolid8
+            width: 10
+            height: 10
+            iconSize: 10
+            iconColor: btn_start.hovered ? FluColors.Grey220  :  FluColors.Grey120
+            anchors.centerIn: parent
+        }
+        visible: swipe.currentIndex !==0
+        onClicked: {
+            swipe.currentIndex = Math.max(swipe.currentIndex - 1, 0)
+        }
+    }
+
+    Button{
+        id:btn_end
+        height: vertical ? 20 : 40
+        width: vertical ? 40 : 20
+        anchors{
+            right: vertical ? undefined : parent.right
+            rightMargin: vertical ? undefined : 2
+            verticalCenter: vertical ? undefined : parent.verticalCenter
+            horizontalCenter: !vertical ? undefined : parent.horizontalCenter
+            bottom: !vertical ? undefined :parent.bottom
+            bottomMargin: !vertical ? undefined :2
+        }
+        background: Rectangle{
+            radius: 4
+            color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,0.97) : Qt.rgba(237/255,237/255,237/255,0.97)
+        }
+        visible: swipe.currentIndex !== swipe.count - 1
+        contentItem:FluIcon{
+            iconSource: vertical ? FluentIcons.CaretDownSolid8 : FluentIcons.CaretRightSolid8
+            width: 10
+            height: 10
+            iconSize: 10
+            iconColor: btn_end.hovered ? FluColors.Grey220  :  FluColors.Grey120
+            anchors.centerIn: parent
+        }
+        onClicked: {
+            swipe.currentIndex = Math.min(swipe.currentIndex + 1,swipe.count-1)
+        }
+    }
+
+}
+

src/controls/FluIconButton.qml

@@ -17,7 +17,7 @@ Button {
         }
         return hovered ? hoverColor : normalColor
     }
-    property color textColor: {
+    property color iconColor: {
         if(FluTheme.dark){
             if(disabled){
                 return Qt.rgba(130/255,130/255,130/255,1)
@@ -57,7 +57,7 @@ Button {
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
             anchors.centerIn: parent
-            color:control.textColor
+            color:control.iconColor
             text: (String.fromCharCode(iconSource).toString(16));
         }
         FluTooltip{

src/controls/FluMediaPlayer.qml

@@ -121,7 +121,6 @@ Rectangle {
             text: formatDuration(slider.value*mediaplayer.duration/slider.maxValue)
         }
 
-
         FluText{
             id:end_time
             anchors{
@@ -132,7 +131,6 @@ Rectangle {
             text: formatDuration(mediaplayer.duration)
         }
 
-
         Row{
             spacing: 10
             anchors{

src/controls/FluNavigationView.qml

@@ -227,16 +227,6 @@ Item {
                     leftMargin: 6
                     rightMargin: 6
                 }
-                Rectangle{
-                    width: 3
-                    height: 18
-                    radius: 1.5
-                    color: FluTheme.primaryColor.dark
-                    visible: nav_list.currentIndex === position && type===0
-                    anchors{
-                        verticalCenter: parent.verticalCenter
-                    }
-                }
                 MouseArea{
                     id:item_mouse
                     hoverEnabled: true
@@ -468,8 +458,21 @@ Item {
                     stackIndex.push(currentIndex)
                 }
             }
+            highlight: Item{
+                clip: true
+                Rectangle{
+                    height: 18
+                    radius: 1.5
+                    color: FluTheme.primaryColor.dark
+                    width: 3
+                    anchors{
+                        verticalCenter: parent.verticalCenter
+                        left: parent.left
+                        leftMargin: 6
+                    }
+                }
+            }
             ScrollBar.vertical: FluScrollBar {}
-
             model:handleItems()
             delegate: Loader{
                 property var model: modelData

src/controls/FluPaneItem.qml

@@ -5,6 +5,7 @@ QtObject {
     readonly property string key : FluApp.uuid()
     readonly property int flag : 0
     property string title
+    property int order : 0
     property int icon
     property bool recentlyAdded: false
     property bool recentlyUpdated: false

src/controls/FluPivot.qml

@@ -0,0 +1,104 @@
+import QtQuick
+import QtQuick.Controls
+import FluentUI
+
+Item {
+
+
+    id:control
+    default property alias content: d.children
+    property color normalColor: FluTheme.dark ? FluColors.Grey120 : FluColors.Grey120
+    property color hoverColor: FluTheme.dark ? FluColors.Grey10 : FluColors.Black
+
+    width: 400
+    height: 300
+    implicitHeight: height
+    implicitWidth: width
+
+    MouseArea{
+        anchors.fill: parent
+        preventStealing: true
+    }
+
+    FluObject{
+        id:d
+    }
+
+    ListView{
+        id:nav_list
+        height: 40
+        width: control.width
+        model:d.children
+        clip: true
+        spacing: 20
+        interactive: false
+        orientation:ListView.Horizontal
+        highlight: Item{
+            clip: true
+            Rectangle{
+                height: 3
+                radius: 1.5
+                color: FluTheme.primaryColor.dark
+                width: nav_list.currentItem ? nav_list.currentItem.width : 0
+                y:37
+                Behavior on width {
+                    NumberAnimation{
+                        duration: 150
+                    }
+                }
+            }
+        }
+        delegate: Button{
+            id:item_button
+            width: item_title.width
+            height: nav_list.height
+            background:Item{
+            }
+            contentItem: Item{
+                FluText {
+                    id:item_title
+                    fontStyle: FluText.Title
+                    font.bold: false
+                    text: modelData.title
+                    anchors.centerIn: parent
+                    color: {
+                        if(item_button.hovered)
+                            return hoverColor
+                        return normalColor
+                    }
+                }
+                transitions: Transition {
+                    NumberAnimation{
+                        duration: 400;
+                    }
+                }
+            }
+            onClicked: {
+                nav_list.currentIndex = index
+            }
+        }
+    }
+
+    Item{
+        id:container
+        anchors{
+            top: nav_list.bottom
+            topMargin: 10
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+
+        Repeater{
+            model:d.children
+            Loader{
+                property var argument: modelData.argument
+                anchors.fill: parent
+                sourceComponent: modelData.contentItem
+                visible: nav_list.currentIndex === index
+            }
+        }
+    }
+
+
+}

src/controls/FluPivotItem.qml

@@ -0,0 +1,8 @@
+import QtQuick
+import FluentUI
+
+QtObject {
+    property string title
+    property Component contentItem
+    property var argument
+}

src/controls/FluScrollBar.qml

@@ -1,34 +1,133 @@
 import QtQuick
 import QtQuick.Controls
-import QtQuick.Controls.impl 2.15
-import QtQuick.Templates 2.15 as T
 import FluentUI
 
-T.ScrollBar {
+ScrollBar {
     id: control
 
     property color handleNormalColor: Qt.rgba(134/255,134/255,134/255,1)
     property color handleHoverColor: Qt.lighter(handleNormalColor)
     property color handlePressColor: Qt.darker(handleNormalColor)
+    property bool expand: false
+
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
                             implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
                              implicitContentHeight + topPadding + bottomPadding)
 
-    padding: 4
+    visible: control.policy !== ScrollBar.AlwaysOff
-    visible: control.policy !== T.ScrollBar.AlwaysOff
     minimumSize: 0.3
-
+    topPadding:{
+        if(vertical){
+            if(expand)
+                return 15
+            return 2
+        }else{
+            if(expand){
+                return 2
+            }
+            return 4
+        }
+    }
+    bottomPadding:{
+        if(vertical){
+            if(expand)
+                return 15
+            return 2
+        }else{
+            if(expand){
+                return 2
+            }
+            return 4
+        }
+    }
+    leftPadding:{
+        if(vertical){
+            if(expand){
+                return 2
+            }
+            return 4
+        }else{
+            if(expand)
+                return 15
+            return 2
+        }
+    }
+    rightPadding:{
+        if(vertical){
+            if(expand){
+                return 2
+            }
+            return 4
+        }else{
+            if(expand)
+                return 15
+            return 2
+        }
+    }
+    Behavior on topPadding {
+        NumberAnimation{
+            duration: 150
+        }
+    }
+    Behavior on bottomPadding {
+        NumberAnimation{
+            duration: 150
+        }
+    }
+    Behavior on leftPadding {
+        NumberAnimation{
+            duration: 150
+        }
+    }
+    Behavior on rightPadding {
+        NumberAnimation{
+            duration: 150
+        }
+    }
     contentItem: Rectangle {
-        implicitWidth: hovered || pressed ? 6 : 2
+        id:item_react
-        implicitHeight:  hovered || pressed ? 6 : 2
+        implicitWidth: expand ? 8 : 2
+        implicitHeight:  expand ? 8 : 2
         radius: width / 2
         layer.samples: 4
         layer.enabled: true
         layer.smooth: true
         color: control.pressed?handlePressColor:control.hovered?handleHoverColor:handleNormalColor
-        opacity:(control.policy === T.ScrollBar.AlwaysOn || control.size < 1.0)?1.0:0.0
+        opacity:(control.policy === ScrollBar.AlwaysOn || control.size < 1.0)?1.0:0.0
+    }
+    background:  Rectangle{
+        radius: 5
+        color: {
+            if(expand && item_react.opacity){
+                if(FluTheme.dark){
+                    return Qt.rgba(0,0,0,1)
+                }
+                return Qt.rgba(1,1,1,1)
+            }
+            return Qt.rgba(0,0,0,0)
+        }
+        MouseArea{
+            id:mouse_item
+            hoverEnabled: true
+            anchors.fill: parent
+            onEntered: {
+                timer.restart()
+                console.debug("onEntered")
+            }
+            onExited: {
+                timer.restart()
+                console.debug("onExited")
+            }
+        }
+    }
+    Timer{
+        id:timer
+        interval: 800
+        onTriggered: {
+            expand = mouse_item.containsMouse || btn_top.hovered || btn_bottom.hovered || btn_left.hovered || btn_right.hovered
+        }
     }
     Behavior on implicitWidth {
         NumberAnimation{
@@ -36,4 +135,66 @@ T.ScrollBar {
         }
     }
 
+    FluIconButton{
+        id:btn_top
+        iconSource: FluentIcons.CaretSolidUp
+        anchors.horizontalCenter: parent.horizontalCenter
+        width:10
+        height:10
+        z:100
+        iconColor: hovered ? FluColors.Black : FluColors.Grey120
+        iconSize: 8
+        anchors.top: parent.top
+        anchors.topMargin: 4
+        visible:vertical && expand
+        onClicked:{
+            decrease()
+        }
+    }
+    FluIconButton{
+        id:btn_bottom
+        iconSource: FluentIcons.CaretSolidDown
+        visible:vertical && expand
+        width:10
+        height:10
+        iconSize: 8
+        iconColor: hovered ? FluColors.Black : FluColors.Grey120
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: 4
+        onClicked:{
+            increase()
+        }
+    }
+    FluIconButton{
+        id:btn_left
+        iconSource: FluentIcons.CaretSolidLeft
+        visible:!vertical && expand
+        width:10
+        height:10
+        iconSize: 8
+        iconColor: hovered ? FluColors.Black : FluColors.Grey120
+        anchors.leftMargin: 4
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.left: parent.left
+        onClicked:{
+            decrease()
+        }
+    }
+    FluIconButton{
+        id:btn_right
+        iconSource: FluentIcons.CaretSolidRight
+        visible:!vertical && expand
+        width:10
+        height:10
+        iconSize: 8
+        iconColor: hovered ? FluColors.Black : FluColors.Grey120
+        anchors.rightMargin: 4
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.right: parent.right
+        onClicked:{
+            increase()
+        }
+    }
+
 }

src/controls/FluTextBox.qml

@@ -7,6 +7,7 @@ TextField{
     property int fontStyle: FluText.Body
     property int pixelSize : FluTheme.textSize
     property bool disabled: false
+    property int iconSource: 0
     property color normalColor: FluTheme.dark ?  Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)
     property color disableColor: FluTheme.dark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
     property color placeholderNormalColor: FluTheme.dark ? Qt.rgba(210/255,210/255,210/255,1) : Qt.rgba(96/255,96/255,96/255,1)
@@ -74,7 +75,38 @@ TextField{
         }
     }
     selectByMouse: true
-    background: FluTextBoxBackground{ inputItem: control }
+    rightPadding: icon_end.visible ? 50 : 30
+    background: FluTextBoxBackground{
+        inputItem: control
+        FluIcon{
+            id:icon_end
+            iconSource: control.iconSource
+            iconSize: 15
+            opacity: 0.5
+            visible: control.iconSource != 0
+            anchors{
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+                rightMargin: 5
+            }
+        }
+    }
+    FluIconButton{
+        iconSource:FluentIcons.ChromeClose
+        iconSize: 10
+        width: 20
+        height: 20
+        opacity: 0.5
+        visible: control.text !== ""
+        anchors{
+            verticalCenter: parent.verticalCenter
+            right: parent.right
+            rightMargin: icon_end.visible ? 25 : 5
+        }
+        onClicked:{
+            control.text = ""
+        }
+    }
     TapHandler {
         acceptedButtons: Qt.RightButton
         onTapped: control.echoMode !== TextInput.Password && menu.popup()

src/res.qrc

@@ -61,5 +61,8 @@
         <file>controls/FluPaneItemExpander.qml</file>
         <file>controls/FluTextBoxMenu.qml</file>
         <file>controls/FluMultilineTextBox.qml</file>
+        <file>controls/FluFlipView.qml</file>
+        <file>controls/FluPivot.qml</file>
+        <file>controls/FluPivotItem.qml</file>
     </qresource>
 </RCC>