diff options
Diffstat (limited to 'src')
70 files changed, 420 insertions, 145 deletions
diff --git a/src/quickcontrols/fluentwinui3/CMakeLists.txt b/src/quickcontrols/fluentwinui3/CMakeLists.txt index 6263397570..fc90b62056 100644 --- a/src/quickcontrols/fluentwinui3/CMakeLists.txt +++ b/src/quickcontrols/fluentwinui3/CMakeLists.txt @@ -15,6 +15,11 @@ set(qml_files "Frame.qml" "GroupBox.qml" "ItemDelegate.qml" + "Menu.qml" + "MenuBar.qml" + "MenuBarItem.qml" + "MenuItem.qml" + "MenuSeparator.qml" "Popup.qml" "ProgressBar.qml" "PageIndicator.qml" @@ -42,6 +47,7 @@ set_source_files_properties(Config.qml PROPERTIES file(GLOB light_theme_resources RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "light/images/*.png") file(GLOB dark_theme_resources RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "dark/images/*.png") +file(GLOB icons_theme_resources RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "icons/*.png") add_subdirectory(impl) @@ -63,6 +69,7 @@ qt_internal_add_qml_module(qtquickcontrols2fluentwinui3styleplugin RESOURCES ${light_theme_resources} ${dark_theme_resources} + ${icons_theme_resources} DEFINES QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII diff --git a/src/quickcontrols/fluentwinui3/Config.qml b/src/quickcontrols/fluentwinui3/Config.qml index b46dece55b..ca2adcc72d 100644 --- a/src/quickcontrols/fluentwinui3/Config.qml +++ b/src/quickcontrols/fluentwinui3/Config.qml @@ -9649,55 +9649,55 @@ QtObject { readonly property real rightShadow: 0 readonly property real topOffset: 0 readonly property real topShadow: 0 - readonly property real width: 225 - readonly property real x: 31702 + readonly property real width: 233 + readonly property real x: 31698 readonly property real y: 2862 } - readonly property real bottomPadding: 4 + readonly property real bottomPadding: 8 readonly property QtObject contentItem: QtObject { readonly property string alignItems: "CENTER" - readonly property real bottomPadding: 4 + readonly property real bottomPadding: 8 readonly property string figmaId: "I2942:5826;2556:19625" readonly property string layoutMode: "HORIZONTAL" - readonly property real leftPadding: 4 + readonly property real leftPadding: 8 readonly property string name: "toolbar-contentItem-disabled" - readonly property real rightPadding: 4 + readonly property real rightPadding: 8 readonly property real spacing: 2 - readonly property real topPadding: 4 + readonly property real topPadding: 8 } - readonly property real leftPadding: 4 + readonly property real leftPadding: 8 readonly property bool mirrored: false - readonly property real rightPadding: 4 + readonly property real rightPadding: 8 readonly property real spacing: 2 readonly property QtObject toolButton1: QtObject { readonly property real bottomShadow: 0 readonly property string figmaId: "I2942:5826;2556:19625;2556:19556" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftShadow: 0 readonly property string name: "toolbar-toolButton1-disabled" readonly property real rightShadow: 0 readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 31706 - readonly property real y: 2869 + readonly property real y: 2870 } readonly property QtObject toolButton2: QtObject { readonly property real bottomShadow: 0 readonly property string figmaId: "I2942:5826;2556:19625;2556:19562" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftShadow: 0 readonly property string name: "toolbar-toolButton2-disabled" readonly property real rightShadow: 0 readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 31779 - readonly property real y: 2869 + readonly property real y: 2870 } - readonly property real topPadding: 4 + readonly property real topPadding: 8 } readonly property QtObject disabled_footer: QtObject { @@ -9714,8 +9714,8 @@ QtObject { readonly property real rightShadow: 0 readonly property real topOffset: 0 readonly property real topShadow: 0 - readonly property real width: 225 - readonly property real x: 31702 + readonly property real width: 233 + readonly property real x: 31698 readonly property real y: 2996 } @@ -9725,41 +9725,41 @@ QtObject { readonly property real bottomPadding: 4 readonly property string figmaId: "I2942:5830;2556:19669" readonly property string layoutMode: "HORIZONTAL" - readonly property real leftPadding: 4 + readonly property real leftPadding: 8 readonly property string name: "toolbar-contentItem-disabled-footer" - readonly property real rightPadding: 4 + readonly property real rightPadding: 8 readonly property real spacing: 2 readonly property real topPadding: 4 } - readonly property real leftPadding: 4 + readonly property real leftPadding: 8 readonly property bool mirrored: false - readonly property real rightPadding: 4 + readonly property real rightPadding: 8 readonly property real spacing: 2 readonly property QtObject toolButton1: QtObject { readonly property real bottomShadow: 0 readonly property string figmaId: "I2942:5830;2556:19669;2556:19584" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftShadow: 0 readonly property string name: "toolbar-toolButton1-disabled-footer" readonly property real rightShadow: 0 readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 31706 - readonly property real y: 3003 + readonly property real y: 3004 } readonly property QtObject toolButton2: QtObject { readonly property real bottomShadow: 0 readonly property string figmaId: "I2942:5830;2556:19669;2556:19585" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftShadow: 0 readonly property string name: "toolbar-toolButton2-disabled-footer" readonly property real rightShadow: 0 readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 31779 - readonly property real y: 3003 + readonly property real y: 3004 } readonly property real topPadding: 4 @@ -9779,55 +9779,55 @@ QtObject { readonly property real rightShadow: 0 readonly property real topOffset: 0 readonly property real topShadow: 0 - readonly property real width: 225 - readonly property real x: 31702 + readonly property real width: 233 + readonly property real x: 31698 readonly property real y: 2795 } - readonly property real bottomPadding: 4 + readonly property real bottomPadding: 8 readonly property QtObject contentItem: QtObject { readonly property string alignItems: "CENTER" - readonly property real bottomPadding: 4 + readonly property real bottomPadding: 8 readonly property string figmaId: "I2942:5824;2556:19603" readonly property string layoutMode: "HORIZONTAL" - readonly property real leftPadding: 4 + readonly property real leftPadding: 8 readonly property string name: "toolbar-contentItem" - readonly property real rightPadding: 4 + readonly property real rightPadding: 8 readonly property real spacing: 2 - readonly property real topPadding: 4 + readonly property real topPadding: 8 } - readonly property real leftPadding: 4 + readonly property real leftPadding: 8 readonly property bool mirrored: false - readonly property real rightPadding: 4 + readonly property real rightPadding: 8 readonly property real spacing: 2 readonly property QtObject toolButton1: QtObject { readonly property real bottomShadow: 0 readonly property string figmaId: "I2942:5824;2556:19603;2556:19556" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftShadow: 0 readonly property string name: "toolbar-toolButton1" readonly property real rightShadow: 0 readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 31706 - readonly property real y: 2802 + readonly property real y: 2803 } readonly property QtObject toolButton2: QtObject { readonly property real bottomShadow: 0 readonly property string figmaId: "I2942:5824;2556:19603;2556:19562" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftShadow: 0 readonly property string name: "toolbar-toolButton2" readonly property real rightShadow: 0 readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 31779 - readonly property real y: 2802 + readonly property real y: 2803 } - readonly property real topPadding: 4 + readonly property real topPadding: 8 } readonly property QtObject normal_footer: QtObject { @@ -9844,8 +9844,8 @@ QtObject { readonly property real rightShadow: 0 readonly property real topOffset: 0 readonly property real topShadow: 0 - readonly property real width: 225 - readonly property real x: 31702 + readonly property real width: 233 + readonly property real x: 31698 readonly property real y: 2929 } @@ -9855,41 +9855,41 @@ QtObject { readonly property real bottomPadding: 4 readonly property string figmaId: "I2942:5828;2556:19647" readonly property string layoutMode: "HORIZONTAL" - readonly property real leftPadding: 4 + readonly property real leftPadding: 8 readonly property string name: "toolbar-contentItem-normal-footer" - readonly property real rightPadding: 4 + readonly property real rightPadding: 8 readonly property real spacing: 2 readonly property real topPadding: 4 } - readonly property real leftPadding: 4 + readonly property real leftPadding: 8 readonly property bool mirrored: false - readonly property real rightPadding: 4 + readonly property real rightPadding: 8 readonly property real spacing: 2 readonly property QtObject toolButton1: QtObject { readonly property real bottomShadow: 0 readonly property string figmaId: "I2942:5828;2556:19647;2556:19584" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftShadow: 0 readonly property string name: "toolbar-toolButton1-normal-footer" readonly property real rightShadow: 0 readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 31706 - readonly property real y: 2936 + readonly property real y: 2937 } readonly property QtObject toolButton2: QtObject { readonly property real bottomShadow: 0 readonly property string figmaId: "I2942:5828;2556:19647;2556:19585" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftShadow: 0 readonly property string name: "toolbar-toolButton2-normal-footer" readonly property real rightShadow: 0 readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 31779 - readonly property real y: 2936 + readonly property real y: 2937 } readonly property real topPadding: 4 @@ -9905,7 +9905,7 @@ QtObject { readonly property string exportType: "image" readonly property string figmaId: "I2557:17283;2556:18709;2556:18691" readonly property string filePath: "dark/images/toolbutton-background-checked.png" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftOffset: 4 readonly property real leftShadow: 0 readonly property string name: "toolbutton-background-checked" @@ -9941,7 +9941,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 16 readonly property real x: 33232 - readonly property real y: 1951 + readonly property real y: 1950 } readonly property QtObject label: QtObject { @@ -9958,7 +9958,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 25 readonly property real x: 33256 - readonly property real y: 1949 + readonly property real y: 1948 } readonly property real leftPadding: 11 @@ -9975,7 +9975,7 @@ QtObject { readonly property string exportType: "image" readonly property string figmaId: "I2557:17289;2556:18724;2556:18691" readonly property string filePath: "dark/images/toolbutton-background-checked-disabled.png" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftOffset: 4 readonly property real leftShadow: 0 readonly property string name: "toolbutton-background-checked-disabled" @@ -10011,7 +10011,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 16 readonly property real x: 33232 - readonly property real y: 2152 + readonly property real y: 2151 } readonly property QtObject label: QtObject { @@ -10028,7 +10028,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 25 readonly property real x: 33256 - readonly property real y: 2150 + readonly property real y: 2149 } readonly property real leftPadding: 11 @@ -10045,7 +10045,7 @@ QtObject { readonly property string exportType: "image" readonly property string figmaId: "I2557:17287;2556:18719;2556:18691" readonly property string filePath: "dark/images/toolbutton-background-checked-hovered.png" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftOffset: 4 readonly property real leftShadow: 0 readonly property string name: "toolbutton-background-checked-hovered" @@ -10055,7 +10055,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 33221 - readonly property real y: 2077 + readonly property real y: 2076 } readonly property real bottomPadding: 11 @@ -10081,7 +10081,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 16 readonly property real x: 33232 - readonly property real y: 2086 + readonly property real y: 2084 } readonly property QtObject label: QtObject { @@ -10098,7 +10098,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 25 readonly property real x: 33256 - readonly property real y: 2084 + readonly property real y: 2082 } readonly property real leftPadding: 11 @@ -10115,7 +10115,7 @@ QtObject { readonly property string exportType: "image" readonly property string figmaId: "I2557:17291;2556:18729;2556:18691" readonly property string filePath: "dark/images/toolbutton-background-checked-pressed.png" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftOffset: 4 readonly property real leftShadow: 0 readonly property string name: "toolbutton-background-checked-pressed" @@ -10125,7 +10125,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 33221 - readonly property real y: 2212 + readonly property real y: 2211 } readonly property real bottomPadding: 11 @@ -10151,7 +10151,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 16 readonly property real x: 33232 - readonly property real y: 2221 + readonly property real y: 2219 } readonly property QtObject label: QtObject { @@ -10168,7 +10168,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 25 readonly property real x: 33256 - readonly property real y: 2219 + readonly property real y: 2217 } readonly property real leftPadding: 11 @@ -10185,7 +10185,7 @@ QtObject { readonly property string exportType: "image" readonly property string figmaId: "I2557:17285;2556:18714;2556:18691" readonly property string filePath: "dark/images/toolbutton-background-disabled.png" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftOffset: 4 readonly property real leftShadow: 0 readonly property string name: "toolbutton-background-disabled" @@ -10195,7 +10195,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 33221 - readonly property real y: 2009 + readonly property real y: 2010 } readonly property real bottomPadding: 11 @@ -10255,7 +10255,7 @@ QtObject { readonly property string exportType: "image" readonly property string figmaId: "I2557:17279;2556:18699;2556:18691" readonly property string filePath: "dark/images/toolbutton-background-hovered.png" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftOffset: 4 readonly property real leftShadow: 0 readonly property string name: "toolbutton-background-hovered" @@ -10265,7 +10265,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 33221 - readonly property real y: 1808 + readonly property real y: 1807 } readonly property real bottomPadding: 11 @@ -10291,7 +10291,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 16 readonly property real x: 33232 - readonly property real y: 1817 + readonly property real y: 1815 } readonly property QtObject label: QtObject { @@ -10308,7 +10308,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 25 readonly property real x: 33256 - readonly property real y: 1815 + readonly property real y: 1813 } readonly property real leftPadding: 11 @@ -10324,7 +10324,7 @@ QtObject { readonly property real bottomShadow: 0 readonly property string figmaId: "I2557:17277;2556:18694;2556:18691" readonly property string filePath: "" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftOffset: 4 readonly property real leftShadow: 0 readonly property string name: "toolbutton-background" @@ -10360,7 +10360,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 16 readonly property real x: 33232 - readonly property real y: 1750 + readonly property real y: 1749 } readonly property QtObject label: QtObject { @@ -10377,7 +10377,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 25 readonly property real x: 33256 - readonly property real y: 1748 + readonly property real y: 1747 } readonly property real leftPadding: 11 @@ -10394,7 +10394,7 @@ QtObject { readonly property string exportType: "image" readonly property string figmaId: "I2557:17281;2556:18704;2556:18691" readonly property string filePath: "dark/images/toolbutton-background-pressed.png" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftOffset: 4 readonly property real leftShadow: 0 readonly property string name: "toolbutton-background-pressed" @@ -10404,7 +10404,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 33221 - readonly property real y: 1864 + readonly property real y: 1863 } readonly property real bottomPadding: 11 @@ -10430,7 +10430,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 16 readonly property real x: 33232 - readonly property real y: 1873 + readonly property real y: 1871 } readonly property QtObject label: QtObject { @@ -10447,7 +10447,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 25 readonly property real x: 33256 - readonly property real y: 1871 + readonly property real y: 1869 } readonly property real leftPadding: 11 @@ -15516,18 +15516,18 @@ QtObject { readonly property QtObject normal: QtObject { readonly property QtObject background: QtObject { readonly property real bottomOffset: 8 - readonly property real bottomShadow: 8 + readonly property real bottomShadow: 24 readonly property string exportType: "image" readonly property string figmaId: "I2557:15450;2308:11133;2313:11247" readonly property string filePath: "light/images/popup-background.png" readonly property real height: 106 readonly property real leftOffset: 8 - readonly property real leftShadow: 4 + readonly property real leftShadow: 16 readonly property string name: "popup-background" readonly property real rightOffset: 8 - readonly property real rightShadow: 4 + readonly property real rightShadow: 16 readonly property real topOffset: 8 - readonly property real topShadow: 0 + readonly property real topShadow: 8 readonly property real width: 118 readonly property real x: 6927 readonly property real y: 2194 @@ -20103,55 +20103,55 @@ QtObject { readonly property real rightShadow: 0 readonly property real topOffset: 0 readonly property real topShadow: 0 - readonly property real width: 225 - readonly property real x: 31349 + readonly property real width: 233 + readonly property real x: 31345 readonly property real y: 2862 } - readonly property real bottomPadding: 4 + readonly property real bottomPadding: 8 readonly property QtObject contentItem: QtObject { readonly property string alignItems: "CENTER" - readonly property real bottomPadding: 4 + readonly property real bottomPadding: 8 readonly property string figmaId: "I2942:5726;2556:19625" readonly property string layoutMode: "HORIZONTAL" - readonly property real leftPadding: 4 + readonly property real leftPadding: 8 readonly property string name: "toolbar-contentItem-disabled" - readonly property real rightPadding: 4 + readonly property real rightPadding: 8 readonly property real spacing: 2 - readonly property real topPadding: 4 + readonly property real topPadding: 8 } - readonly property real leftPadding: 4 + readonly property real leftPadding: 8 readonly property bool mirrored: false - readonly property real rightPadding: 4 + readonly property real rightPadding: 8 readonly property real spacing: 2 readonly property QtObject toolButton1: QtObject { readonly property real bottomShadow: 0 readonly property string figmaId: "I2942:5726;2556:19625;2556:19556" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftShadow: 0 readonly property string name: "toolbar-toolButton1-disabled" readonly property real rightShadow: 0 readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 31353 - readonly property real y: 2869 + readonly property real y: 2870 } readonly property QtObject toolButton2: QtObject { readonly property real bottomShadow: 0 readonly property string figmaId: "I2942:5726;2556:19625;2556:19562" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftShadow: 0 readonly property string name: "toolbar-toolButton2-disabled" readonly property real rightShadow: 0 readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 31426 - readonly property real y: 2869 + readonly property real y: 2870 } - readonly property real topPadding: 4 + readonly property real topPadding: 8 } readonly property QtObject disabled_footer: QtObject { @@ -20168,8 +20168,8 @@ QtObject { readonly property real rightShadow: 0 readonly property real topOffset: 0 readonly property real topShadow: 0 - readonly property real width: 225 - readonly property real x: 31349 + readonly property real width: 233 + readonly property real x: 31345 readonly property real y: 2996 } @@ -20179,41 +20179,41 @@ QtObject { readonly property real bottomPadding: 4 readonly property string figmaId: "I2942:5728;2556:19669" readonly property string layoutMode: "HORIZONTAL" - readonly property real leftPadding: 4 + readonly property real leftPadding: 8 readonly property string name: "toolbar-contentItem-disabled-footer" - readonly property real rightPadding: 4 + readonly property real rightPadding: 8 readonly property real spacing: 2 readonly property real topPadding: 4 } - readonly property real leftPadding: 4 + readonly property real leftPadding: 8 readonly property bool mirrored: false - readonly property real rightPadding: 4 + readonly property real rightPadding: 8 readonly property real spacing: 2 readonly property QtObject toolButton1: QtObject { readonly property real bottomShadow: 0 readonly property string figmaId: "I2942:5728;2556:19669;2556:19584" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftShadow: 0 readonly property string name: "toolbar-toolButton1-disabled-footer" readonly property real rightShadow: 0 readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 31353 - readonly property real y: 3003 + readonly property real y: 3004 } readonly property QtObject toolButton2: QtObject { readonly property real bottomShadow: 0 readonly property string figmaId: "I2942:5728;2556:19669;2556:19585" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftShadow: 0 readonly property string name: "toolbar-toolButton2-disabled-footer" readonly property real rightShadow: 0 readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 31426 - readonly property real y: 3003 + readonly property real y: 3004 } readonly property real topPadding: 4 @@ -20233,55 +20233,55 @@ QtObject { readonly property real rightShadow: 0 readonly property real topOffset: 0 readonly property real topShadow: 0 - readonly property real width: 225 - readonly property real x: 31349 + readonly property real width: 233 + readonly property real x: 31345 readonly property real y: 2795 } - readonly property real bottomPadding: 4 + readonly property real bottomPadding: 8 readonly property QtObject contentItem: QtObject { readonly property string alignItems: "CENTER" - readonly property real bottomPadding: 4 + readonly property real bottomPadding: 8 readonly property string figmaId: "I2942:5725;2556:19603" readonly property string layoutMode: "HORIZONTAL" - readonly property real leftPadding: 4 + readonly property real leftPadding: 8 readonly property string name: "toolbar-contentItem" - readonly property real rightPadding: 4 + readonly property real rightPadding: 8 readonly property real spacing: 2 - readonly property real topPadding: 4 + readonly property real topPadding: 8 } - readonly property real leftPadding: 4 + readonly property real leftPadding: 8 readonly property bool mirrored: false - readonly property real rightPadding: 4 + readonly property real rightPadding: 8 readonly property real spacing: 2 readonly property QtObject toolButton1: QtObject { readonly property real bottomShadow: 0 readonly property string figmaId: "I2942:5725;2556:19603;2556:19556" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftShadow: 0 readonly property string name: "toolbar-toolButton1" readonly property real rightShadow: 0 readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 31353 - readonly property real y: 2802 + readonly property real y: 2803 } readonly property QtObject toolButton2: QtObject { readonly property real bottomShadow: 0 readonly property string figmaId: "I2942:5725;2556:19603;2556:19562" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftShadow: 0 readonly property string name: "toolbar-toolButton2" readonly property real rightShadow: 0 readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 31426 - readonly property real y: 2802 + readonly property real y: 2803 } - readonly property real topPadding: 4 + readonly property real topPadding: 8 } readonly property QtObject normal_footer: QtObject { @@ -20298,8 +20298,8 @@ QtObject { readonly property real rightShadow: 0 readonly property real topOffset: 0 readonly property real topShadow: 0 - readonly property real width: 225 - readonly property real x: 31349 + readonly property real width: 233 + readonly property real x: 31345 readonly property real y: 2929 } @@ -20309,41 +20309,41 @@ QtObject { readonly property real bottomPadding: 4 readonly property string figmaId: "I2942:5727;2556:19647" readonly property string layoutMode: "HORIZONTAL" - readonly property real leftPadding: 4 + readonly property real leftPadding: 8 readonly property string name: "toolbar-contentItem-normal-footer" - readonly property real rightPadding: 4 + readonly property real rightPadding: 8 readonly property real spacing: 2 readonly property real topPadding: 4 } - readonly property real leftPadding: 4 + readonly property real leftPadding: 8 readonly property bool mirrored: false - readonly property real rightPadding: 4 + readonly property real rightPadding: 8 readonly property real spacing: 2 readonly property QtObject toolButton1: QtObject { readonly property real bottomShadow: 0 readonly property string figmaId: "I2942:5727;2556:19647;2556:19584" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftShadow: 0 readonly property string name: "toolbar-toolButton1-normal-footer" readonly property real rightShadow: 0 readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 31353 - readonly property real y: 2936 + readonly property real y: 2937 } readonly property QtObject toolButton2: QtObject { readonly property real bottomShadow: 0 readonly property string figmaId: "I2942:5727;2556:19647;2556:19585" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftShadow: 0 readonly property string name: "toolbar-toolButton2-normal-footer" readonly property real rightShadow: 0 readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 31426 - readonly property real y: 2936 + readonly property real y: 2937 } readonly property real topPadding: 4 @@ -20359,7 +20359,7 @@ QtObject { readonly property string exportType: "image" readonly property string figmaId: "I2557:15659;2556:18709;2556:18691" readonly property string filePath: "light/images/toolbutton-background-checked.png" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftOffset: 4 readonly property real leftShadow: 0 readonly property string name: "toolbutton-background-checked" @@ -20369,7 +20369,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 33127 - readonly property real y: 1942 + readonly property real y: 1943 } readonly property real bottomPadding: 11 @@ -20429,7 +20429,7 @@ QtObject { readonly property string exportType: "image" readonly property string figmaId: "I2557:15665;2556:18724;2556:18691" readonly property string filePath: "light/images/toolbutton-background-checked-disabled.png" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftOffset: 4 readonly property real leftShadow: 0 readonly property string name: "toolbutton-background-checked-disabled" @@ -20439,7 +20439,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 33127 - readonly property real y: 2143 + readonly property real y: 2144 } readonly property real bottomPadding: 11 @@ -20499,7 +20499,7 @@ QtObject { readonly property string exportType: "image" readonly property string figmaId: "I2557:15663;2556:18719;2556:18691" readonly property string filePath: "light/images/toolbutton-background-checked-hovered.png" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftOffset: 4 readonly property real leftShadow: 0 readonly property string name: "toolbutton-background-checked-hovered" @@ -20509,7 +20509,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 33127 - readonly property real y: 2076 + readonly property real y: 2077 } readonly property real bottomPadding: 11 @@ -20569,7 +20569,7 @@ QtObject { readonly property string exportType: "image" readonly property string figmaId: "I2557:15667;2556:18729;2556:18691" readonly property string filePath: "light/images/toolbutton-background-checked-pressed.png" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftOffset: 4 readonly property real leftShadow: 0 readonly property string name: "toolbutton-background-checked-pressed" @@ -20579,7 +20579,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 33127 - readonly property real y: 2212.5 + readonly property real y: 2211.5 } readonly property real bottomPadding: 11 @@ -20605,7 +20605,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 16 readonly property real x: 33138 - readonly property real y: 2221.5 + readonly property real y: 2219.5 } readonly property QtObject label: QtObject { @@ -20622,7 +20622,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 25 readonly property real x: 33162 - readonly property real y: 2219.5 + readonly property real y: 2217.5 } readonly property real leftPadding: 11 @@ -20639,7 +20639,7 @@ QtObject { readonly property string exportType: "image" readonly property string figmaId: "I2557:15661;2556:18714;2556:18691" readonly property string filePath: "light/images/toolbutton-background-disabled.png" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftOffset: 4 readonly property real leftShadow: 0 readonly property string name: "toolbutton-background-disabled" @@ -20649,7 +20649,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 33127 - readonly property real y: 2009.5 + readonly property real y: 2010.5 } readonly property real bottomPadding: 11 @@ -20709,7 +20709,7 @@ QtObject { readonly property string exportType: "image" readonly property string figmaId: "I2557:15655;2556:18699;2556:18691" readonly property string filePath: "light/images/toolbutton-background-hovered.png" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftOffset: 4 readonly property real leftShadow: 0 readonly property string name: "toolbutton-background-hovered" @@ -20719,7 +20719,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 33127 - readonly property real y: 1810.5 + readonly property real y: 1811.5 } readonly property real bottomPadding: 11 @@ -20778,7 +20778,7 @@ QtObject { readonly property real bottomShadow: 0 readonly property string figmaId: "I2557:15653;2556:18694;2556:18691" readonly property string filePath: "" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftOffset: 4 readonly property real leftShadow: 0 readonly property string name: "toolbutton-background" @@ -20788,7 +20788,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 33127 - readonly property real y: 1741 + readonly property real y: 1742 } readonly property real bottomPadding: 11 @@ -20848,7 +20848,7 @@ QtObject { readonly property string exportType: "image" readonly property string figmaId: "I2557:15657;2556:18704;2556:18691" readonly property string filePath: "light/images/toolbutton-background-pressed.png" - readonly property real height: 34 + readonly property real height: 32 readonly property real leftOffset: 4 readonly property real leftShadow: 0 readonly property string name: "toolbutton-background-pressed" @@ -20858,7 +20858,7 @@ QtObject { readonly property real topShadow: 0 readonly property real width: 71 readonly property real x: 33126 - readonly property real y: 1877 + readonly property real y: 1878 } readonly property real bottomPadding: 11 diff --git a/src/quickcontrols/fluentwinui3/Menu.qml b/src/quickcontrols/fluentwinui3/Menu.qml new file mode 100644 index 0000000000..0179d497e4 --- /dev/null +++ b/src/quickcontrols/fluentwinui3/Menu.qml @@ -0,0 +1,62 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.impl +import QtQuick.Effects + +T.Menu { + id: control + + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + contentHeight + topPadding + bottomPadding) + + leftPadding: 5 + topPadding: 5 + rightPadding: 5 + bottomPadding: 5 + margins: 0 + overlap: 4 + + delegate: MenuItem { } + + contentItem: ListView { + implicitHeight: contentHeight + model: control.contentModel + interactive: Window.window + ? contentHeight + control.topPadding + control.bottomPadding > control.height + : false + currentIndex: control.currentIndex + spacing: 4 + clip: true + + ScrollIndicator.vertical: ScrollIndicator {} + } + + enter: Transition { + NumberAnimation { + property: "height" + from: control.implicitHeight * 0.33 + to: control.implicitHeight + easing.type: Easing.OutCubic + duration: 250 + } + } + + background: StyleImage { + implicitWidth: 200 + implicitHeight: 30 + imageConfig: Config.controls.popup["normal"].background + } + + T.Overlay.modal: Rectangle { + color: "transparent" + } + + T.Overlay.modeless: Rectangle { + color: "transparent" + } +} diff --git a/src/quickcontrols/fluentwinui3/MenuBar.qml b/src/quickcontrols/fluentwinui3/MenuBar.qml new file mode 100644 index 0000000000..56cc205a56 --- /dev/null +++ b/src/quickcontrols/fluentwinui3/MenuBar.qml @@ -0,0 +1,37 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.impl + +T.MenuBar { + id: control + + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + contentHeight + topPadding + bottomPadding) + + spacing: config.spacing || 0 + + topPadding: config.topPadding || 0 + bottomPadding: config.bottomPadding || 0 + leftPadding: config.leftPadding || 0 + rightPadding: config.rightPadding || 0 + + readonly property var config: Config.controls.toolbar["normal"] || {} + + delegate: MenuBarItem { } + + contentItem: Row { + spacing: control.spacing + Repeater { + model: control.contentModel + } + } + + background: StyleImage { + imageConfig: control.config.background + } +} diff --git a/src/quickcontrols/fluentwinui3/MenuBarItem.qml b/src/quickcontrols/fluentwinui3/MenuBarItem.qml new file mode 100644 index 0000000000..2b8b88366c --- /dev/null +++ b/src/quickcontrols/fluentwinui3/MenuBarItem.qml @@ -0,0 +1,59 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.impl + +T.MenuBarItem { + id: control + + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + implicitContentHeight + topPadding + bottomPadding, + implicitIndicatorHeight + topPadding + bottomPadding) + + spacing: config.spacing || 0 + + topPadding: config.topPadding || 0 + bottomPadding: config.bottomPadding || 0 + leftPadding: config.leftPadding || 0 + rightPadding: config.rightPadding || 0 + + topInset: -config.topInset || 0 + bottomInset: -config.bottomInset || 0 + leftInset: -config.leftInset || 0 + rightInset: -config.rightInset || 0 + + icon.width: config.icon.width + icon.height: config.icon.height + icon.color: !control.down ? control.palette.buttonText : Application.styleHints.colorScheme === Qt.Light + ? Qt.rgba(control.palette.buttonText.r, control.palette.buttonText.g, control.palette.buttonText.b, 0.62) + : Qt.rgba(control.palette.buttonText.r, control.palette.buttonText.g, control.palette.buttonText.b, 0.7725) + + readonly property string __currentState: [ + !control.enabled && "disabled", + control.enabled && !control.down && (control.hovered || control.highlighted) && "hovered", + down && "pressed" + ].filter(Boolean).join("_") || "normal" + readonly property var config: Config.controls.toolbutton[__currentState] || {} + + contentItem: IconLabel { + spacing: control.spacing + mirrored: control.mirrored + display: control.display + alignment: Qt.AlignLeft + + icon: control.icon + text: control.text + font: control.font + color: control.icon.color + } + + background: StyleImage { + imageConfig: control.config.background + implicitWidth: 30 + implicitHeight: 30 + } +} diff --git a/src/quickcontrols/fluentwinui3/MenuItem.qml b/src/quickcontrols/fluentwinui3/MenuItem.qml new file mode 100644 index 0000000000..dd5a40770a --- /dev/null +++ b/src/quickcontrols/fluentwinui3/MenuItem.qml @@ -0,0 +1,87 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.impl + +T.MenuItem { + id: control + + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + implicitContentHeight + topPadding + bottomPadding, + implicitIndicatorHeight + topPadding + bottomPadding) + + leftPadding: 12 + rightPadding: 12 + topPadding: 3 + bottomPadding: 3 + spacing: 6 + + icon.width: 16 + icon.height: 16 + icon.color: control.palette.text + + implicitTextPadding: control.checkable && control.indicator ? control.indicator.width + control.spacing : 0 + + contentItem: IconLabel { + readonly property real arrowPadding: control.subMenu && control.arrow ? control.arrow.width + control.spacing : 0 + leftPadding: !control.mirrored ? control.textPadding : arrowPadding + rightPadding: control.mirrored ? control.textPadding : arrowPadding + + spacing: control.spacing + mirrored: control.mirrored + display: control.display + alignment: Qt.AlignLeft + + icon: control.icon + text: control.text + font: control.font + color: control.icon.color + } + + arrow: ColorImage { + x: control.mirrored ? control.padding : control.width - width - control.padding + y: control.topPadding + (control.availableHeight - height) / 2 + width: 20 + + visible: control.subMenu + rotation: control.mirrored ? -180 : 0 + color: control.palette.text + source: Qt.resolvedUrl("icons/menuarrow.png") + fillMode: Image.Pad + } + + indicator: Item { + implicitWidth: 14 + implicitHeight: 10 + + x: control.mirrored ? control.width - width - control.rightPadding : control.leftPadding + y: control.topPadding + (control.availableHeight - height) / 2 + + visible: control.checkable + + ColorImage { + y: (parent.height - height) / 2 + color: control.palette.text + source: Qt.resolvedUrl("icons/checkmark.png") + visible: control.checkState === Qt.Checked + || (control.checked && control.checkState === undefined) + } + } + + background: Rectangle { + implicitWidth: 200 + implicitHeight: 30 + radius: 4 + + readonly property real alpha: control.down + ? Application.styleHints.colorScheme === Qt.Light ? 0.0241 : 0.0419 + : control.hovered ? Application.styleHints.colorScheme === Qt.Light ? 0.0373 : 0.0605 : 0 + + color: Application.styleHints.colorScheme === Qt.Light ? Qt.rgba(0, 0, 0, alpha) : Qt.rgba(1, 1, 1, alpha) + visible: control.down || control.highlighted + } +} diff --git a/src/quickcontrols/fluentwinui3/MenuSeparator.qml b/src/quickcontrols/fluentwinui3/MenuSeparator.qml new file mode 100644 index 0000000000..364c56c2d7 --- /dev/null +++ b/src/quickcontrols/fluentwinui3/MenuSeparator.qml @@ -0,0 +1,23 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +import QtQuick +import QtQuick.Templates as T + +T.MenuSeparator { + id: control + + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + implicitContentHeight + topPadding + bottomPadding) + + horizontalPadding: 0 + verticalPadding: 2 + + contentItem: Rectangle { + implicitWidth: 188 + implicitHeight: 1 + color: Application.styleHints.colorScheme === Qt.Light ? "#0F000000" : "#15FFFFFF" + } +} diff --git a/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-hovered.png b/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-hovered.png Binary files differindex c1130ce8b7..453412c23b 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-hovered.png +++ b/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-hovered.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-hovered@2x.png b/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-hovered@2x.png Binary files differindex 5c2ca550bd..5f2cbf8baa 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-hovered@2x.png +++ b/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-hovered@2x.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-hovered@3x.png b/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-hovered@3x.png Binary files differindex 92d64b4f92..738c4ad912 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-hovered@3x.png +++ b/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-hovered@3x.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-pressed.png b/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-pressed.png Binary files differindex 453412c23b..c1130ce8b7 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-pressed.png +++ b/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-pressed.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-pressed@2x.png b/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-pressed@2x.png Binary files differindex 5f2cbf8baa..5c2ca550bd 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-pressed@2x.png +++ b/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-pressed@2x.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-pressed@3x.png b/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-pressed@3x.png Binary files differindex 738c4ad912..92d64b4f92 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-pressed@3x.png +++ b/src/quickcontrols/fluentwinui3/dark/images/itemdelegate-background-highlighted-pressed@3x.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-disabled.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-disabled.png Binary files differindex 0e17e612b4..928be60d8a 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-disabled.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-disabled.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-disabled@2x.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-disabled@2x.png Binary files differindex 33605497e4..7a6440bae1 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-disabled@2x.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-disabled@2x.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-disabled@3x.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-disabled@3x.png Binary files differindex 2ff55b535d..6a397bccea 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-disabled@3x.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-disabled@3x.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-hovered.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-hovered.png Binary files differindex 75d2fac6ca..23f8cbe559 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-hovered.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-hovered.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-hovered@2x.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-hovered@2x.png Binary files differindex cc2473e4f1..2f263d5020 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-hovered@2x.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-hovered@2x.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-hovered@3x.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-hovered@3x.png Binary files differindex 4200b29d52..7d66d8e013 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-hovered@3x.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-hovered@3x.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-pressed.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-pressed.png Binary files differindex 0d5d6c9a14..7b8939c9a7 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-pressed.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-pressed.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-pressed@2x.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-pressed@2x.png Binary files differindex 99ec97a2ca..7267df8365 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-pressed@2x.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-pressed@2x.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-pressed@3x.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-pressed@3x.png Binary files differindex a4d542b2c3..0496aa661b 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-pressed@3x.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked-pressed@3x.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked.png Binary files differindex e657d2f133..1f55b83fd6 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked@2x.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked@2x.png Binary files differindex be11df6637..d53f62f89d 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked@2x.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked@2x.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked@3x.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked@3x.png Binary files differindex 3e441bacfa..26486a634f 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked@3x.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-checked@3x.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-disabled.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-disabled.png Binary files differindex 9d292c4415..1d0298e602 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-disabled.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-disabled.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-disabled@2x.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-disabled@2x.png Binary files differindex 32af78bc8c..8a5402c469 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-disabled@2x.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-disabled@2x.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-disabled@3x.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-disabled@3x.png Binary files differindex a543a36720..b45d11cdf1 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-disabled@3x.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-disabled@3x.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-hovered.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-hovered.png Binary files differindex f9db93fc55..ed3337891f 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-hovered.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-hovered.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-hovered@2x.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-hovered@2x.png Binary files differindex f6fbb3b1c0..6e54138d52 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-hovered@2x.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-hovered@2x.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-hovered@3x.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-hovered@3x.png Binary files differindex 3fe9e9fc3b..30df88370b 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-hovered@3x.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-hovered@3x.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-pressed.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-pressed.png Binary files differindex cc4f541696..18edbb28c2 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-pressed.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-pressed.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-pressed@2x.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-pressed@2x.png Binary files differindex ef38d62f67..9bc55731ff 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-pressed@2x.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-pressed@2x.png diff --git a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-pressed@3x.png b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-pressed@3x.png Binary files differindex 6945314496..1ccbcebfc9 100644 --- a/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-pressed@3x.png +++ b/src/quickcontrols/fluentwinui3/dark/images/toolbutton-background-pressed@3x.png diff --git a/src/quickcontrols/fluentwinui3/icons/checkmark.png b/src/quickcontrols/fluentwinui3/icons/checkmark.png Binary files differnew file mode 100644 index 0000000000..35fe52c8c0 --- /dev/null +++ b/src/quickcontrols/fluentwinui3/icons/checkmark.png diff --git a/src/quickcontrols/fluentwinui3/icons/checkmark@2x.png b/src/quickcontrols/fluentwinui3/icons/checkmark@2x.png Binary files differnew file mode 100644 index 0000000000..fb7096b4b5 --- /dev/null +++ b/src/quickcontrols/fluentwinui3/icons/checkmark@2x.png diff --git a/src/quickcontrols/fluentwinui3/icons/checkmark@3x.png b/src/quickcontrols/fluentwinui3/icons/checkmark@3x.png Binary files differnew file mode 100644 index 0000000000..e0c2790607 --- /dev/null +++ b/src/quickcontrols/fluentwinui3/icons/checkmark@3x.png diff --git a/src/quickcontrols/fluentwinui3/icons/menuarrow.png b/src/quickcontrols/fluentwinui3/icons/menuarrow.png Binary files differnew file mode 100644 index 0000000000..b504351fe1 --- /dev/null +++ b/src/quickcontrols/fluentwinui3/icons/menuarrow.png diff --git a/src/quickcontrols/fluentwinui3/icons/menuarrow@2x.png b/src/quickcontrols/fluentwinui3/icons/menuarrow@2x.png Binary files differnew file mode 100644 index 0000000000..fa9082d0c0 --- /dev/null +++ b/src/quickcontrols/fluentwinui3/icons/menuarrow@2x.png diff --git a/src/quickcontrols/fluentwinui3/icons/menuarrow@3x.png b/src/quickcontrols/fluentwinui3/icons/menuarrow@3x.png Binary files differnew file mode 100644 index 0000000000..acb626246d --- /dev/null +++ b/src/quickcontrols/fluentwinui3/icons/menuarrow@3x.png diff --git a/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-hovered.png b/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-hovered.png Binary files differindex 0f61dd9b8b..d6b022ab13 100644 --- a/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-hovered.png +++ b/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-hovered.png diff --git a/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-hovered@2x.png b/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-hovered@2x.png Binary files differindex cc20bdbeb5..0d89e35b0b 100644 --- a/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-hovered@2x.png +++ b/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-hovered@2x.png diff --git a/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-hovered@3x.png b/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-hovered@3x.png Binary files differindex aae4bf62d7..b42360e129 100644 --- a/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-hovered@3x.png +++ b/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-hovered@3x.png diff --git a/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-pressed.png b/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-pressed.png Binary files differindex d6b022ab13..0f61dd9b8b 100644 --- a/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-pressed.png +++ b/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-pressed.png diff --git a/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-pressed@2x.png b/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-pressed@2x.png Binary files differindex 0d89e35b0b..cc20bdbeb5 100644 --- a/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-pressed@2x.png +++ b/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-pressed@2x.png diff --git a/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-pressed@3x.png b/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-pressed@3x.png Binary files differindex b42360e129..aae4bf62d7 100644 --- a/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-pressed@3x.png +++ b/src/quickcontrols/fluentwinui3/light/images/itemdelegate-background-highlighted-pressed@3x.png diff --git a/src/quickcontrols/fluentwinui3/light/images/popup-background.png b/src/quickcontrols/fluentwinui3/light/images/popup-background.png Binary files differindex cfd2c17633..ea396f40e7 100644 --- a/src/quickcontrols/fluentwinui3/light/images/popup-background.png +++ b/src/quickcontrols/fluentwinui3/light/images/popup-background.png diff --git a/src/quickcontrols/fluentwinui3/light/images/popup-background@2x.png b/src/quickcontrols/fluentwinui3/light/images/popup-background@2x.png Binary files differindex a1c2a1a815..8fe03df3b8 100644 --- a/src/quickcontrols/fluentwinui3/light/images/popup-background@2x.png +++ b/src/quickcontrols/fluentwinui3/light/images/popup-background@2x.png diff --git a/src/quickcontrols/fluentwinui3/light/images/popup-background@3x.png b/src/quickcontrols/fluentwinui3/light/images/popup-background@3x.png Binary files differindex 5bea92a6b3..e48fee2c05 100644 --- a/src/quickcontrols/fluentwinui3/light/images/popup-background@3x.png +++ b/src/quickcontrols/fluentwinui3/light/images/popup-background@3x.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-disabled.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-disabled.png Binary files differindex b6054fbd90..0c8d964da0 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-disabled.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-disabled.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-disabled@2x.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-disabled@2x.png Binary files differindex aca559422a..42f937f1cb 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-disabled@2x.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-disabled@2x.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-disabled@3x.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-disabled@3x.png Binary files differindex b7b68b4ef7..4827e72b73 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-disabled@3x.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-disabled@3x.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-hovered.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-hovered.png Binary files differindex 08f56b2c8f..0423194f30 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-hovered.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-hovered.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-hovered@2x.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-hovered@2x.png Binary files differindex 94acc63e7f..2d526e2810 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-hovered@2x.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-hovered@2x.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-hovered@3x.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-hovered@3x.png Binary files differindex f2985b2d3b..4a55015e77 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-hovered@3x.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-hovered@3x.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-pressed.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-pressed.png Binary files differindex bfeea7584b..650ae63d3c 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-pressed.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-pressed.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-pressed@2x.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-pressed@2x.png Binary files differindex 434dbbc450..a460f43e62 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-pressed@2x.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-pressed@2x.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-pressed@3x.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-pressed@3x.png Binary files differindex a417dfb5fd..429e73b57b 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-pressed@3x.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked-pressed@3x.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked.png Binary files differindex 9f1512fd12..1547cd48c5 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked@2x.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked@2x.png Binary files differindex 8368e02601..02b9f56e5f 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked@2x.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked@2x.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked@3x.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked@3x.png Binary files differindex 11f120e83d..2230e54105 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked@3x.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-checked@3x.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-disabled.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-disabled.png Binary files differindex 9d292c4415..1d0298e602 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-disabled.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-disabled.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-disabled@2x.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-disabled@2x.png Binary files differindex 32af78bc8c..8a5402c469 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-disabled@2x.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-disabled@2x.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-disabled@3x.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-disabled@3x.png Binary files differindex a543a36720..b45d11cdf1 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-disabled@3x.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-disabled@3x.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-hovered.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-hovered.png Binary files differindex 6f3fec4a36..31ccd2004e 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-hovered.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-hovered.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-hovered@2x.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-hovered@2x.png Binary files differindex 3fb9cceceb..f213d9a9eb 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-hovered@2x.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-hovered@2x.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-hovered@3x.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-hovered@3x.png Binary files differindex 6fe3bc2bcb..bbf37a2408 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-hovered@3x.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-hovered@3x.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-pressed.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-pressed.png Binary files differindex 99aa8a6de1..f8a043b8b1 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-pressed.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-pressed.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-pressed@2x.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-pressed@2x.png Binary files differindex a6bc176cb6..4221815f7d 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-pressed@2x.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-pressed@2x.png diff --git a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-pressed@3x.png b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-pressed@3x.png Binary files differindex 06bc0c64b0..00df1c3bbd 100644 --- a/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-pressed@3x.png +++ b/src/quickcontrols/fluentwinui3/light/images/toolbutton-background-pressed@3x.png |
