From 0abdc293198426dd42b884a599c22fa0afa572c1 Mon Sep 17 00:00:00 2001
From: Mentalflow <312902918@qq.com>
Date: Tue, 25 Jun 2024 21:12:31 +0800
Subject: [PATCH] RibbonTabBar,RibbonRadioButton,RibbonTour: Bug fix for Qt 5.

---
 lib_source/qml/Qt5/RibbonRadioButton.qml | 7 +++----
 lib_source/qml/Qt5/RibbonTabBar.qml      | 4 ++--
 lib_source/qml/Qt5/RibbonTour.qml        | 2 +-
 lib_source/qml/Qt6/RibbonRadioButton.qml | 7 +++----
 lib_source/qml/Qt6/RibbonTabBar.qml      | 4 ++--
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/lib_source/qml/Qt5/RibbonRadioButton.qml b/lib_source/qml/Qt5/RibbonRadioButton.qml
index 77db018..d06a871 100644
--- a/lib_source/qml/Qt5/RibbonRadioButton.qml
+++ b/lib_source/qml/Qt5/RibbonRadioButton.qml
@@ -12,7 +12,7 @@ RadioButton {
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
                              implicitContentHeight + topPadding + bottomPadding,
                              implicitIndicatorHeight + topPadding + bottomPadding)
-
+    font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
     padding: 0
     spacing: 6
 
@@ -56,11 +56,10 @@ RadioButton {
         }
     }
 
-    contentItem: RibbonText {
-        viewOnly: true
+    contentItem: Text {
         leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0
         rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0
-
+        renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
         text: control.text
         font: control.font
         color: control.labelColor
diff --git a/lib_source/qml/Qt5/RibbonTabBar.qml b/lib_source/qml/Qt5/RibbonTabBar.qml
index f5ee3c3..d6c7b20 100644
--- a/lib_source/qml/Qt5/RibbonTabBar.qml
+++ b/lib_source/qml/Qt5/RibbonTabBar.qml
@@ -75,8 +75,8 @@ Item{
             useSolidBg: true
             radius: modernStyle ? 10 :0
             clip: true
-            target: Window.window.viewItems
-            targetRect: mapToItem(Window.window.viewItems, blur.x, blur.y, width, height)
+            target: Window.window.viewItems ? Window.window.viewItems : undefined
+            targetRect: Window.window.viewItems ? mapToItem(Window.window.viewItems, blur.x, blur.y, width, height) : Qt.rect(0,0,0,0)
             Behavior on maskColor {
                 ColorAnimation {
                     duration: 60
diff --git a/lib_source/qml/Qt5/RibbonTour.qml b/lib_source/qml/Qt5/RibbonTour.qml
index 1b43857..837bb08 100644
--- a/lib_source/qml/Qt5/RibbonTour.qml
+++ b/lib_source/qml/Qt5/RibbonTour.qml
@@ -34,7 +34,7 @@ Popup {
     y: (Overlay.overlay.height - height) / 2
     closePolicy: Popup.NoAutoClose
     Overlay.modal:Rectangle{
-        color: !RibbonTheme.isDarkMode ? Qt.alpha("white", 0.5) : Qt.alpha("black", 0.5)
+        color: !RibbonTheme.isDarkMode ? Qt.rgba(255,255,255,0.5) : Qt.rgba(0,0,0,0.5)
     }
     Overlay.modeless:Rectangle{
         color:"transparent"
diff --git a/lib_source/qml/Qt6/RibbonRadioButton.qml b/lib_source/qml/Qt6/RibbonRadioButton.qml
index c7ed953..8601e12 100644
--- a/lib_source/qml/Qt6/RibbonRadioButton.qml
+++ b/lib_source/qml/Qt6/RibbonRadioButton.qml
@@ -12,7 +12,7 @@ RadioButton {
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
                              implicitContentHeight + topPadding + bottomPadding,
                              implicitIndicatorHeight + topPadding + bottomPadding)
-
+    font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
     padding: 0
     spacing: 6
 
@@ -56,11 +56,10 @@ RadioButton {
         }
     }
 
-    contentItem: RibbonText {
-        viewOnly: true
+    contentItem: Text {
         leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0
         rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0
-
+        renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
         text: control.text
         font: control.font
         color: control.labelColor
diff --git a/lib_source/qml/Qt6/RibbonTabBar.qml b/lib_source/qml/Qt6/RibbonTabBar.qml
index 3ff2e51..1746918 100644
--- a/lib_source/qml/Qt6/RibbonTabBar.qml
+++ b/lib_source/qml/Qt6/RibbonTabBar.qml
@@ -75,8 +75,8 @@ Item{
             useSolidBg: true
             radius: modernStyle ? 10 :0
             clip: true
-            target: Window.window.viewItems
-            targetRect: mapToItem(Window.window.viewItems, blur.x, blur.y, width, height)
+            target: Window.window.viewItems ? Window.window.viewItems : undefined
+            targetRect: Window.window.viewItems ? mapToItem(Window.window.viewItems, blur.x, blur.y, width, height) : Qt.rect(0,0,0,0)
             Behavior on maskColor {
                 ColorAnimation {
                     duration: 60