Project: Improve Image visual quality and icon display.

example/qml/Qt5/about.qml

@@ -22,6 +22,8 @@ RibbonWindow {
         Image {
             source: "qrc:/qt/qml/RibbonUI/resources/imgs/icon.png"
             fillMode:Image.PreserveAspectFit
+            mipmap: true
+            autoTransform: true
             Layout.preferredHeight: 120
             Layout.preferredWidth: height
             Layout.alignment: Qt.AlignHCenter

example/qml/Qt5/example.qml

@@ -673,6 +673,8 @@ RibbonWindow {
             Image {
                 source: "qrc:/qt/qml/RibbonUI/resources/imgs/icon.png"
                 fillMode:Image.PreserveAspectFit
+                mipmap: true
+                autoTransform: true
                 Layout.preferredHeight: 300
                 Layout.preferredWidth: height
                 Layout.alignment: Qt.AlignHCenter
@@ -763,12 +765,13 @@ RibbonWindow {
         RibbonButton{
             showBg:false
             adaptHeight:true
-            iconSource: RibbonIcons.AppStore
+            iconSource: RibbonIcons.StoreMicrosoft
             checkable: true
             tipText: "Test Button 7"
         }
     }
 
+    titleBar.titleIconSource: "qrc:/qt/qml/RibbonUI/resources/imgs/icon.png"
     titleBar.rightContent:RowLayout{
         spacing: 1
         layoutDirection: Qt.RightToLeft

example/qml/Qt6/about.qml

@@ -23,6 +23,8 @@ RibbonWindow {
         Image {
             source: "qrc:/qt/qml/RibbonUI/resources/imgs/icon.png"
             fillMode:Image.PreserveAspectFit
+            mipmap: true
+            autoTransform: true
             Layout.preferredHeight: 120
             Layout.preferredWidth: height
             Layout.alignment: Qt.AlignHCenter

example/qml/Qt6/example.qml

@@ -673,6 +673,8 @@ RibbonWindow {
             Image {
                 source: "qrc:/qt/qml/RibbonUI/resources/imgs/icon.png"
                 fillMode:Image.PreserveAspectFit
+                mipmap: true
+                autoTransform: true
                 Layout.preferredHeight: 300
                 Layout.preferredWidth: height
                 Layout.alignment: Qt.AlignHCenter
@@ -763,12 +765,13 @@ RibbonWindow {
         RibbonButton{
             showBg:false
             adaptHeight:true
-            iconSource: RibbonIcons.AppStore
+            iconSource: RibbonIcons.StoreMicrosoft
             checkable: true
             tipText: "Test Button 7"
         }
     }
 
+    titleBar.titleIconSource: "qrc:/qt/qml/RibbonUI/resources/imgs/icon.png"
     titleBar.rightContent:RowLayout{
         spacing: 1
         layoutDirection: Qt.RightToLeft

lib_source/qml/Qt5/RibbonBackStageView.qml

@@ -97,7 +97,6 @@ Popup {
             text: backText
             font.pixelSize: 30
             iconSource: RibbonIcons.ArrowCircleLeft
-            implicitWidth: ribbonIcon.width
             implicitHeight: ribbonIcon.height
             textColor: RibbonTheme.modernStyle && !RibbonTheme.isDarkMode ? "black" : "white"
             ribbonIcon.filled: hovered
@@ -105,7 +104,7 @@ Popup {
                 top: parent.top
                 topMargin: 30
                 left: parent.left
-                leftMargin: 30
+                leftMargin: 8
             }
             visible: showBackBtn
             ribbonIcon.iconSize: 30
@@ -207,7 +206,7 @@ Popup {
                         id :rib_icon
                         iconSource: typeof(model.menu_icon) === "number" ? model.menu_icon : 0
                         iconSourceFilled: typeof(model.menu_icon_filled) === "number" ? model.menu_icon_filled : iconSource
-                        iconSize: menu_label.contentHeight
+                        iconSize: menu_label.visible ? menu_label.contentHeight : 16
                         visible: typeof(model.menu_icon) === "number" && model.menu_icon
                         Layout.alignment: Qt.AlignVCenter
                         filled: item_bg.view.currentIndex === index && item_bg.isCurrentMenu
@@ -218,7 +217,9 @@ Popup {
                         source: typeof(model.menu_icon) === "string" ? model.menu_icon : ""
                         visible: typeof(model.menu_icon) === "string"
                         fillMode:Image.PreserveAspectFit
-                        height: menu_label.contentHeight
+                        mipmap: true
+                        autoTransform: true
+                        height: menu_label.visible ? menu_label.contentHeight : 16
                         width: height
                         Layout.alignment: Qt.AlignVCenter
                     }
@@ -232,6 +233,7 @@ Popup {
                         elide: Text.ElideRight
                         font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
                         renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
+                        visible: text
                         Layout.preferredWidth: {
                             let w = 0
                             w += rib_icon.visible ? rib_icon.contentWidth : 0

lib_source/qml/Qt5/RibbonBottomBar.qml

@@ -60,6 +60,7 @@ Item {
         anchors{
             left: parent.left
             leftMargin: 20
+            verticalCenter: parent.verticalCenter
         }
     }
 
@@ -71,6 +72,7 @@ Item {
         anchors{
             right: parent.right
             rightMargin: 20
+            verticalCenter: parent.verticalCenter
         }
         layoutDirection: Qt.RightToLeft
         RibbonButton{

lib_source/qml/Qt5/RibbonButton.qml

@@ -36,6 +36,7 @@ Button {
         color: bgColor
     }
     contentItem: Item{
+        clip: true
         implicitWidth: layout.width + 13
         implicitHeight: adaptHeight?root.parent.height>=layout.height?root.parent.height:layout.height:layout.height + 10
         Rectangle{
@@ -76,7 +77,7 @@ Button {
                 id :rib_icon
                 iconSource: typeof(root.iconSource) === "number" ? root.iconSource : 0
                 iconSourceFilled: typeof(root.iconSourceFilled) === "number" ? root.iconSourceFilled : iconSource
-                iconSize: label.contentHeight
+                iconSize: label.visible ? label.contentHeight : 16
                 visible: typeof(root.iconSource) === "number"
                 Layout.alignment: Qt.AlignVCenter
                 filled: pressed || checked
@@ -98,7 +99,9 @@ Button {
                 source: typeof(root.iconSource) === "string" ? root.iconSource : ""
                 visible: typeof(root.iconSource) === "string"
                 fillMode:Image.PreserveAspectFit
-                height: label.contentHeight
+                mipmap: true
+                autoTransform: true
+                height: label.visible ? label.contentHeight : 16
                 width: height
                 Layout.alignment: Qt.AlignVCenter
             }
@@ -111,6 +114,7 @@ Button {
                 font.pixelSize: 12
                 font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
                 renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
+                visible: text
                 color: {
                     if (!showBg && (hovered || checked || pressed) && textColorReverse)
                         return Qt.lighter(textColor)

lib_source/qml/Qt5/RibbonCheckBox.qml

@@ -12,13 +12,13 @@ Button {
     checkable: true
 
     property bool isDarkMode: RibbonTheme.isDarkMode
-    property int btnSize: 20
+    property int btnSize: 16
     property string borderColor: isDarkMode ? "white" : "black"
     property real borderWidth: 1.4
     property string iconColor: "white"
     property string iconFilledBgColor: "#2143AB"
     property string textColor: isDarkMode ? "white" : "black"
-    property int textSize: 11
+    property int textSize: 12
     property bool textBold: false
     property bool textOnLeft: false
     property bool showTooltip: false
@@ -43,12 +43,12 @@ Button {
                     color: control.borderColor
                     width: control.borderWidth
                 }
-                radius: 4.5
+                radius: 0.225 * btnSize
                 Rectangle{
                     id: bg_fill
                     anchors.fill: parent
                     scale: control.hovered || control.pressed ? 0.6 : 1.05
-                    radius: 4.5
+                    radius: 0.225 * btnSize
                     color: !control.pressed?control.iconFilledBgColor:Qt.darker(control.iconFilledBgColor)
                     visible: control.hovered || control.pressed || control.checked
                     Behavior on scale{

lib_source/qml/Qt5/RibbonIcon.qml

@@ -6,6 +6,7 @@ Text {
     property int iconSize: 20
     property bool filled: false
     property int iconSourceFilled
+    clip: true
 
     onIconSourceChanged: {
         if (typeof(iconSourceFilled) === 'undefined' || iconSourceFilled === iconSource)

lib_source/qml/Qt5/RibbonMenuItem.qml

@@ -68,7 +68,7 @@ MenuItem {
                 id :rib_icon
                 iconSource: typeof(control.iconSource) === "number" ? control.iconSource : 0
                 iconSourceFilled: typeof(control.iconSourceFilled) === "number" ? control.iconSourceFilled : iconSource
-                iconSize: label.contentHeight
+                iconSize: label.visible ? label.contentHeight : 16
                 visible: typeof(control.iconSource) === "number" && control.iconSource
                 Layout.alignment: Qt.AlignVCenter
                 filled: pressed || checked
@@ -79,7 +79,9 @@ MenuItem {
                 source: typeof(control.iconSource) === "string" ? control.iconSource : ""
                 visible: typeof(control.iconSource) === "string"
                 fillMode:Image.PreserveAspectFit
-                height: label.contentHeight
+                mipmap: true
+                autoTransform: true
+                height: label.visible ? label.contentHeight : 16
                 width: height
                 Layout.alignment: Qt.AlignVCenter
             }
@@ -93,6 +95,7 @@ MenuItem {
                 font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
                 color: textColor
                 renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
+                visible: text
                 Layout.preferredWidth:{
                     let w = 0
                     w += rib_icon.visible ? rib_icon.contentWidth : 0

lib_source/qml/Qt5/RibbonPushButton.qml

@@ -62,6 +62,8 @@ Item {
                 source: typeof(root.iconSource) === "string" ? root.iconSource : ""
                 visible: typeof(root.iconSource) === "string"
                 fillMode:Image.PreserveAspectFit
+                mipmap: true
+                autoTransform: true
                 height: left.height
                 width: height
                 Layout.alignment: Qt.AlignVCenter

lib_source/qml/Qt5/RibbonRadioButton.qml

@@ -48,9 +48,9 @@ RadioButton {
             radius: width/2
             color: {
                 if(control.down)
-                    return Qt.rgba(255,255,255,0.2)
+                    return RibbonTheme.isDarkMode ? Qt.rgba(255,255,255,0.2) : Qt.rgba(0,0,0,0.2)
                 if(control.hovered)
-                    return Qt.rgba(255,255,255,0.1)
+                    return RibbonTheme.isDarkMode ? Qt.rgba(255,255,255,0.1) : Qt.rgba(0,0,0,0.1)
                 return 'transparent'
             }
         }

lib_source/qml/Qt5/RibbonSwitchButton.qml

@@ -15,7 +15,7 @@ Button {
     property bool showGrabberText: true
     property string grabberText: control.checked ? qsTr("Open") : qsTr("Close")
     property string textColor: isDarkMode ? "white" : "black"
-    property int textSize: 11
+    property int textSize: 12
     property string grabberCheckedColor: isDarkMode ? "#8AAAEB" : "#2850A4"
     property string grabberUncheckedColor: isDarkMode ? "#292929" : "white"
     property string grabberTextCheckedColor: isDarkMode ? "black" : "white"

lib_source/qml/Qt5/RibbonTitleBar.qml

@@ -7,7 +7,7 @@ import RibbonUI 1.0
 Item {
     id: control
     height: 30
-    property int minimumWidth: title_text.implicitWidth + Math.max(leftContainer.width, rightContainer.width) * 2 + (Qt.platform.os === "osx" ? 65 : 0) + 20
+    property int minimumWidth: mid_layout.implicitWidth + Math.max(leftContainer.width, rightContainer.width) * 2 + (Qt.platform.os === "osx" ? 65 : 0) + 20
     property string title: Window.window.title
     property bool showStyleSwitch: true
     property bool showDarkmodeBtn: true
@@ -16,6 +16,9 @@ Item {
     property bool modernStyle: RibbonTheme.modernStyle
     property string titleColor: modernStyle ? "transparent" : isDarkMode ? "#282828" : "#2C59B7"
     property string titleTextColor: modernStyle ? isDarkMode ? "white" : "black" : "white"
+    property var titleIconSource
+    property var titleIconSourceFilled
+    property var titleIcon: typeof(control.titleIconSource) === "string" ? pic_icon : rib_icon
     default property alias content: leftContainer.data
     property alias leftContent: leftContainer.data
     property alias rightContent: rightContainer.data
@@ -43,17 +46,61 @@ Item {
         }
     }
 
-    Text {
+
-        id: title_text
+    RowLayout{
+        id: mid_layout
         anchors.centerIn: parent
-        text: control.title
+        RibbonIcon{
-        font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
+            id :rib_icon
-        color: titleTextColor
+            iconSource: typeof(control.titleIconSource) === "number" ? control.titleIconSource : 0
-        renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
+            iconSourceFilled: typeof(control.titleIconSourceFilled) === "number" ? control.titleIconSourceFilled : iconSource
-        Behavior on color {
+            iconSize: title_text.contentHeight
-            ColorAnimation {
+            visible: typeof(control.titleIconSource) === "number"
-                duration: 60
+            Layout.preferredHeight: title_text.visible ? title_text.contentHeight : 16
-                easing.type: Easing.OutSine
+            Layout.preferredWidth: Layout.preferredHeight
+            Layout.alignment: Qt.AlignVCenter
+            filled: mouse.pressed
+            color: {
+                if (mouse.containsMouse || mouse.pressed)
+                    return Qt.lighter(titleTextColor)
+                else
+                    return titleTextColor
+            }
+            Behavior on color {
+                ColorAnimation {
+                    duration: 60
+                    easing.type: Easing.OutSine
+                }
+            }
+            MouseArea{
+                id: mouse
+                hoverEnabled: true
+            }
+        }
+        Image {
+            id: pic_icon
+            source: typeof(control.titleIconSource) === "string" ? control.titleIconSource : ""
+            visible: typeof(control.titleIconSource) === "string"
+            fillMode:Image.PreserveAspectFit
+            mipmap: true
+            autoTransform: true
+            Layout.preferredHeight: title_text.visible ? title_text.contentHeight : 16
+            Layout.preferredWidth: Layout.preferredHeight
+            Layout.alignment: Qt.AlignVCenter
+        }
+        Text {
+            id: title_text
+            text: control.title
+            font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
+            color: titleTextColor
+            renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
+            Layout.alignment: Qt.AlignVCenter
+            visible: text
+            Behavior on color {
+                ColorAnimation {
+                    duration: 60
+                    easing.type: Easing.OutSine
+                }
             }
         }
     }
@@ -65,9 +112,15 @@ Item {
             top: parent.top
             left: parent.left
             bottom: parent.bottom
-            leftMargin: Qt.platform.os === "osx" ? 65 : 10
+            leftMargin: Qt.platform.os === "osx" && Window.window.visibility === Window.Windowed ? 65 : 10
         }
-        Layout.maximumWidth: (parent.width - title_text.contentWidth) / 2
+        Behavior on anchors.leftMargin {
+            NumberAnimation{
+                duration: 100
+                easing.type: Easing.OutSine
+            }
+        }
+        Layout.maximumWidth: (parent.width - mid_layout.contentWidth) / 2
     }
 
     RowLayout{
@@ -79,7 +132,7 @@ Item {
             bottom: parent.bottom
             rightMargin: 10
         }
-        Layout.maximumWidth: (parent.width - title_text.contentWidth) / 2
+        Layout.maximumWidth: (parent.width - mid_layout.contentWidth) / 2
         layoutDirection: Qt.RightToLeft
         RowLayout{
             visible: Qt.platform.os !== "osx"

lib_source/qml/Qt5/RibbonToolTip.qml

@@ -18,10 +18,10 @@ ToolTip {
 
     background: Rectangle {
         radius: 3
-        color: RibbonTheme.isDarkMode ? "#2C2C29" : "#E0E0E2"
+        color: RibbonTheme.modernStyle ? isDarkMode ? "black" : "white" : RibbonTheme.isDarkMode ? "#2C2C29" : "#E0E0E2"
-        layer.enabled: true
+        layer.enabled: !RibbonTheme.modernStyle
         layer.effect: RibbonShadow{}
-        border.color: isDarkMode ? "#5C5D5D" : "#B5B4B5"
+        border.color: RibbonTheme.modernStyle ? isDarkMode ? "#ADADAD" : "#616161" : isDarkMode ? "#5C5D5D" : "#B5B4B5"
         border.width: 1
     }
 }

lib_source/qml/Qt5/RibbonWindow.qml

@@ -46,6 +46,7 @@ Window {
             windowAgent.setSystemButton(WindowAgent.Maximize, titleBar.maximizeBtn);
             windowAgent.setSystemButton(WindowAgent.Close, titleBar.closeBtn);
         }
+        windowAgent.setSystemButton(WindowAgent.WindowIcon, titleBar.titleIcon);
         windowAgent.setHitTestVisible(titleBar.leftContainer)
         windowAgent.setHitTestVisible(titleBar.rightContainer)
         windowAgent.setTitleBar(titleBar)
@@ -115,7 +116,7 @@ Window {
             return 'transparent'
         }
         border.color: RibbonTheme.isDarkMode ? "#7A7A7A" : "#2C59B7"
-        border.width: RibbonTheme.modernStyle ?  1 : 0
+        border.width: RibbonTheme.modernStyle && window.visibility === Window.Windowed ?  1 : 0
         radius: Qt.platform.os === 'windows' ? RibbonUI.isWin11 ? 7 : 0 : 10
         visible: RibbonTheme.modernStyle || blurBehindWindow
     }

lib_source/qml/Qt6/RibbonBackStageView.qml

@@ -97,7 +97,6 @@ Popup {
             text: backText
             font.pixelSize: 30
             iconSource: RibbonIcons.ArrowCircleLeft
-            implicitWidth: ribbonIcon.width
             implicitHeight: ribbonIcon.height
             textColor: RibbonTheme.modernStyle && !RibbonTheme.isDarkMode ? "black" : "white"
             ribbonIcon.filled: hovered
@@ -105,7 +104,7 @@ Popup {
                 top: parent.top
                 topMargin: 30
                 left: parent.left
-                leftMargin: 30
+                leftMargin: 8
             }
             visible: showBackBtn
             ribbonIcon.iconSize: 30
@@ -207,7 +206,7 @@ Popup {
                         id :rib_icon
                         iconSource: typeof(model.menu_icon) === "number" ? model.menu_icon : 0
                         iconSourceFilled: typeof(model.menu_icon_filled) === "number" ? model.menu_icon_filled : iconSource
-                        iconSize: menu_label.contentHeight
+                        iconSize: menu_label.visible ? menu_label.contentHeight : 16
                         visible: typeof(model.menu_icon) === "number" && model.menu_icon
                         Layout.alignment: Qt.AlignVCenter
                         filled: item_bg.view.currentIndex === index && item_bg.isCurrentMenu
@@ -218,7 +217,9 @@ Popup {
                         source: typeof(model.menu_icon) === "string" ? model.menu_icon : ""
                         visible: typeof(model.menu_icon) === "string"
                         fillMode:Image.PreserveAspectFit
-                        height: menu_label.contentHeight
+                        mipmap: true
+                        autoTransform: true
+                        height: menu_label.visible ? menu_label.contentHeight : 16
                         width: height
                         Layout.alignment: Qt.AlignVCenter
                     }
@@ -232,6 +233,7 @@ Popup {
                         elide: Text.ElideRight
                         font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
                         renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
+                        visible: text
                         Layout.preferredWidth: {
                             let w = 0
                             w += rib_icon.visible ? rib_icon.contentWidth : 0

lib_source/qml/Qt6/RibbonBottomBar.qml

@@ -60,6 +60,7 @@ Item {
         anchors{
             left: parent.left
             leftMargin: 20
+            verticalCenter: parent.verticalCenter
         }
     }
 
@@ -71,6 +72,7 @@ Item {
         anchors{
             right: parent.right
             rightMargin: 20
+            verticalCenter: parent.verticalCenter
         }
         layoutDirection: Qt.RightToLeft
         RibbonButton{

lib_source/qml/Qt6/RibbonButton.qml

@@ -36,6 +36,7 @@ Button {
         color: bgColor
     }
     contentItem: Item{
+        clip: true
         implicitWidth: layout.width + 13
         implicitHeight: adaptHeight?root.parent.height>=layout.height?root.parent.height:layout.height:layout.height + 10
         Rectangle{
@@ -76,7 +77,7 @@ Button {
                 id :rib_icon
                 iconSource: typeof(root.iconSource) === "number" ? root.iconSource : 0
                 iconSourceFilled: typeof(root.iconSourceFilled) === "number" ? root.iconSourceFilled : iconSource
-                iconSize: label.contentHeight
+                iconSize: label.visible ? label.contentHeight : 16
                 visible: typeof(root.iconSource) === "number"
                 Layout.alignment: Qt.AlignVCenter
                 filled: pressed || checked
@@ -98,7 +99,9 @@ Button {
                 source: typeof(root.iconSource) === "string" ? root.iconSource : ""
                 visible: typeof(root.iconSource) === "string"
                 fillMode:Image.PreserveAspectFit
-                height: label.contentHeight
+                mipmap: true
+                autoTransform: true
+                height: label.visible ? label.contentHeight : 16
                 width: height
                 Layout.alignment: Qt.AlignVCenter
             }
@@ -111,6 +114,7 @@ Button {
                 font.pixelSize: 12
                 font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
                 renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
+                visible: text
                 color: {
                     if (!showBg && (hovered || checked || pressed) && textColorReverse)
                         return Qt.lighter(textColor)

lib_source/qml/Qt6/RibbonCheckBox.qml

@@ -12,13 +12,13 @@ Button {
     checkable: true
 
     property bool isDarkMode: RibbonTheme.isDarkMode
-    property int btnSize: 20
+    property int btnSize: 16
     property string borderColor: isDarkMode ? "white" : "black"
     property real borderWidth: 1.4
     property string iconColor: "white"
     property string iconFilledBgColor: "#2143AB"
     property string textColor: isDarkMode ? "white" : "black"
-    property int textSize: 11
+    property int textSize: 12
     property bool textBold: false
     property bool textOnLeft: false
     property bool showTooltip: false
@@ -43,12 +43,12 @@ Button {
                     color: control.borderColor
                     width: control.borderWidth
                 }
-                radius: 4.5
+                radius: 0.225 * btnSize
                 Rectangle{
                     id: bg_fill
                     anchors.fill: parent
                     scale: control.hovered || control.pressed ? 0.6 : 1.05
-                    radius: 4.5
+                    radius: 0.225 * btnSize
                     color: !control.pressed?control.iconFilledBgColor:Qt.darker(control.iconFilledBgColor)
                     visible: control.hovered || control.pressed || control.checked
                     Behavior on scale{

lib_source/qml/Qt6/RibbonIcon.qml

@@ -7,6 +7,7 @@ Text {
     property int iconSize: 20
     property bool filled: false
     property int iconSourceFilled
+    clip: true
 
     onIconSourceChanged: {
         if (typeof(iconSourceFilled) === 'undefined' || iconSourceFilled === iconSource)

lib_source/qml/Qt6/RibbonMenuItem.qml

@@ -68,7 +68,7 @@ MenuItem {
                 id :rib_icon
                 iconSource: typeof(control.iconSource) === "number" ? control.iconSource : 0
                 iconSourceFilled: typeof(control.iconSourceFilled) === "number" ? control.iconSourceFilled : iconSource
-                iconSize: label.contentHeight
+                iconSize: label.visible ? label.contentHeight : 16
                 visible: typeof(control.iconSource) === "number" && control.iconSource
                 Layout.alignment: Qt.AlignVCenter
                 filled: pressed || checked
@@ -79,7 +79,9 @@ MenuItem {
                 source: typeof(control.iconSource) === "string" ? control.iconSource : ""
                 visible: typeof(control.iconSource) === "string"
                 fillMode:Image.PreserveAspectFit
-                height: label.contentHeight
+                mipmap: true
+                autoTransform: true
+                height: label.visible ? label.contentHeight : 16
                 width: height
                 Layout.alignment: Qt.AlignVCenter
             }
@@ -93,6 +95,7 @@ MenuItem {
                 font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
                 color: textColor
                 renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
+                visible: text
                 Layout.preferredWidth:{
                     let w = 0
                     w += rib_icon.visible ? rib_icon.contentWidth : 0

lib_source/qml/Qt6/RibbonPushButton.qml

@@ -62,6 +62,8 @@ Item {
                 source: typeof(root.iconSource) === "string" ? root.iconSource : ""
                 visible: typeof(root.iconSource) === "string"
                 fillMode:Image.PreserveAspectFit
+                mipmap: true
+                autoTransform: true
                 height: left.height
                 width: height
                 Layout.alignment: Qt.AlignVCenter

lib_source/qml/Qt6/RibbonRadioButton.qml

@@ -48,9 +48,9 @@ RadioButton {
             radius: width/2
             color: {
                 if(control.down)
-                    return Qt.rgba(255,255,255,0.2)
+                    return RibbonTheme.isDarkMode ? Qt.rgba(255,255,255,0.2) : Qt.rgba(0,0,0,0.2)
                 if(control.hovered)
-                    return Qt.rgba(255,255,255,0.1)
+                    return RibbonTheme.isDarkMode ? Qt.rgba(255,255,255,0.1) : Qt.rgba(0,0,0,0.1)
                 return 'transparent'
             }
         }

lib_source/qml/Qt6/RibbonSwitchButton.qml

@@ -15,7 +15,7 @@ Button {
     property bool showGrabberText: true
     property string grabberText: control.checked ? qsTr("Open") : qsTr("Close")
     property string textColor: isDarkMode ? "white" : "black"
-    property int textSize: 11
+    property int textSize: 12
     property string grabberCheckedColor: isDarkMode ? "#8AAAEB" : "#2850A4"
     property string grabberUncheckedColor: isDarkMode ? "#292929" : "white"
     property string grabberTextCheckedColor: isDarkMode ? "black" : "white"

lib_source/qml/Qt6/RibbonTitleBar.qml

@@ -1,12 +1,13 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
+import QtQuick.Window
 import RibbonUI
 
 Item {
     id: control
     height: 30
-    property int minimumWidth: title_text.implicitWidth + Math.max(leftContainer.width, rightContainer.width) * 2 + (Qt.platform.os === "osx" ? 65 : 0) + 20
+    property int minimumWidth: mid_layout.implicitWidth + Math.max(leftContainer.width, rightContainer.width) * 2 + (Qt.platform.os === "osx" ? 65 : 0) + 20
     property string title: Window.window.title
     property bool showStyleSwitch: true
     property bool showDarkmodeBtn: true
@@ -15,6 +16,9 @@ Item {
     property bool modernStyle: RibbonTheme.modernStyle
     property string titleColor: modernStyle ? "transparent" : isDarkMode ? "#282828" : "#2C59B7"
     property string titleTextColor: modernStyle ? isDarkMode ? "white" : "black" : "white"
+    property var titleIconSource
+    property var titleIconSourceFilled
+    property var titleIcon: typeof(control.titleIconSource) === "string" ? pic_icon : rib_icon
     default property alias content: leftContainer.data
     property alias leftContent: leftContainer.data
     property alias rightContent: rightContainer.data
@@ -42,17 +46,61 @@ Item {
         }
     }
 
-    Text {
+
-        id: title_text
+    RowLayout{
+        id: mid_layout
         anchors.centerIn: parent
-        text: control.title
+        RibbonIcon{
-        font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
+            id :rib_icon
-        color: titleTextColor
+            iconSource: typeof(control.titleIconSource) === "number" ? control.titleIconSource : 0
-        renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
+            iconSourceFilled: typeof(control.titleIconSourceFilled) === "number" ? control.titleIconSourceFilled : iconSource
-        Behavior on color {
+            iconSize: title_text.contentHeight
-            ColorAnimation {
+            visible: typeof(control.titleIconSource) === "number"
-                duration: 60
+            Layout.preferredHeight: title_text.visible ? title_text.contentHeight : 16
-                easing.type: Easing.OutSine
+            Layout.preferredWidth: Layout.preferredHeight
+            Layout.alignment: Qt.AlignVCenter
+            filled: mouse.pressed
+            color: {
+                if (mouse.containsMouse || mouse.pressed)
+                    return Qt.lighter(titleTextColor)
+                else
+                    return titleTextColor
+            }
+            Behavior on color {
+                ColorAnimation {
+                    duration: 60
+                    easing.type: Easing.OutSine
+                }
+            }
+            MouseArea{
+                id: mouse
+                hoverEnabled: true
+            }
+        }
+        Image {
+            id: pic_icon
+            source: typeof(control.titleIconSource) === "string" ? control.titleIconSource : ""
+            visible: typeof(control.titleIconSource) === "string"
+            fillMode:Image.PreserveAspectFit
+            mipmap: true
+            autoTransform: true
+            Layout.preferredHeight: title_text.visible ? title_text.contentHeight : 16
+            Layout.preferredWidth: Layout.preferredHeight
+            Layout.alignment: Qt.AlignVCenter
+        }
+        Text {
+            id: title_text
+            text: control.title
+            font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
+            color: titleTextColor
+            renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
+            Layout.alignment: Qt.AlignVCenter
+            visible: text
+            Behavior on color {
+                ColorAnimation {
+                    duration: 60
+                    easing.type: Easing.OutSine
+                }
             }
         }
     }
@@ -64,9 +112,15 @@ Item {
             top: parent.top
             left: parent.left
             bottom: parent.bottom
-            leftMargin: Qt.platform.os === "osx" ? 65 : 10
+            leftMargin: Qt.platform.os === "osx" && Window.window.visibility === Window.Windowed ? 65 : 10
         }
-        Layout.maximumWidth: (parent.width - title_text.contentWidth) / 2
+        Behavior on anchors.leftMargin {
+            NumberAnimation{
+                duration: 100
+                easing.type: Easing.OutSine
+            }
+        }
+        Layout.maximumWidth: (parent.width - mid_layout.contentWidth) / 2
     }
 
     RowLayout{
@@ -78,7 +132,7 @@ Item {
             bottom: parent.bottom
             rightMargin: 10
         }
-        Layout.maximumWidth: (parent.width - title_text.contentWidth) / 2
+        Layout.maximumWidth: (parent.width - mid_layout.contentWidth) / 2
         layoutDirection: Qt.RightToLeft
         RowLayout{
             visible: Qt.platform.os !== "osx"

lib_source/qml/Qt6/RibbonToolTip.qml

@@ -17,10 +17,10 @@ ToolTip {
 
     background: Rectangle {
         radius: 3
-        color: RibbonTheme.isDarkMode ? "#2C2C29" : "#E0E0E2"
+        color: RibbonTheme.modernStyle ? isDarkMode ? "black" : "white" : RibbonTheme.isDarkMode ? "#2C2C29" : "#E0E0E2"
-        layer.enabled: true
+        layer.enabled: !RibbonTheme.modernStyle
         layer.effect: RibbonShadow{}
-        border.color: isDarkMode ? "#5C5D5D" : "#B5B4B5"
+        border.color: RibbonTheme.modernStyle ? isDarkMode ? "#ADADAD" : "#616161" : isDarkMode ? "#5C5D5D" : "#B5B4B5"
         border.width: 1
     }
 }

lib_source/qml/Qt6/RibbonWindow.qml

@@ -45,6 +45,7 @@ Window {
             windowAgent.setSystemButton(WindowAgent.Maximize, titleBar.maximizeBtn);
             windowAgent.setSystemButton(WindowAgent.Close, titleBar.closeBtn);
         }
+        windowAgent.setSystemButton(WindowAgent.WindowIcon, titleBar.titleIcon);
         windowAgent.setHitTestVisible(titleBar.leftContainer)
         windowAgent.setHitTestVisible(titleBar.rightContainer)
         windowAgent.setTitleBar(titleBar)
@@ -114,7 +115,7 @@ Window {
             return 'transparent'
         }
         border.color: RibbonTheme.isDarkMode ? "#7A7A7A" : "#2C59B7"
-        border.width: RibbonTheme.modernStyle ?  1 : 0
+        border.width: RibbonTheme.modernStyle && window.visibility === Window.Windowed ?  1 : 0
         radius: Qt.platform.os === 'windows' ? RibbonUI.isWin11 ? 7 : 0 : 10
         visible: RibbonTheme.modernStyle || blurBehindWindow
     }