From 2acd3c7f86fe58bdca7d702fbf66513ac67949dd Mon Sep 17 00:00:00 2001
From: Mentalflow <312902918@qq.com>
Date: Thu, 16 May 2024 15:12:10 +0800
Subject: [PATCH] RibbonBottomBar,RibbonMenuItem,RibbonWindow,RibbonTour:
 Improved.

---
 lib_source/qml/RibbonBottomBar.qml | 4 +++-
 lib_source/qml/RibbonMenuItem.qml  | 2 +-
 lib_source/qml/RibbonTour.qml      | 2 ++
 lib_source/qml/RibbonWindow.qml    | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib_source/qml/RibbonBottomBar.qml b/lib_source/qml/RibbonBottomBar.qml
index d6a5a44..c26ab78 100644
--- a/lib_source/qml/RibbonBottomBar.qml
+++ b/lib_source/qml/RibbonBottomBar.qml
@@ -33,11 +33,13 @@ Item {
         }
     }
 
-    Rectangle{
+    RibbonRectangle{
         visible: modern_style
         color: dark_mode ? "#141414" : "#F5F5F5"
         opacity: bg_opacity
         anchors.fill: parent
+        bottomLeftRadius: Qt.platform.os === 'windows' ? RibbonUI.is_win11 ? 7 : 0 : 10
+        bottomRightRadius: bottomLeftRadius
     }
 
     Rectangle{
diff --git a/lib_source/qml/RibbonMenuItem.qml b/lib_source/qml/RibbonMenuItem.qml
index 8da55fb..bd3d53c 100644
--- a/lib_source/qml/RibbonMenuItem.qml
+++ b/lib_source/qml/RibbonMenuItem.qml
@@ -69,7 +69,7 @@ MenuItem {
                 icon_source: typeof(control.icon_source) === "number" ? control.icon_source : 0
                 icon_source_filled: typeof(control.icon_source_filled) === "number" ? control.icon_source_filled : icon_source
                 icon_size: label.contentHeight
-                visible: typeof(control.icon_source) === "number"
+                visible: typeof(control.icon_source) === "number" && control.icon_source
                 Layout.alignment: Qt.AlignVCenter
                 filled: pressed || checked
                 color: text_color
diff --git a/lib_source/qml/RibbonTour.qml b/lib_source/qml/RibbonTour.qml
index 78a688c..32614f0 100644
--- a/lib_source/qml/RibbonTour.qml
+++ b/lib_source/qml/RibbonTour.qml
@@ -30,6 +30,8 @@ Popup {
     leftInset: 0
     rightInset: 0
     bottomInset: 0
+    x: (Overlay.overlay.width - width) / 2
+    y: (Overlay.overlay.height - height) / 2
     closePolicy: Popup.NoAutoClose
     Overlay.modal:Rectangle{
         color: !RibbonTheme.dark_mode ? Qt.alpha("white", 0.5) : Qt.alpha("black", 0.5)
diff --git a/lib_source/qml/RibbonWindow.qml b/lib_source/qml/RibbonWindow.qml
index c519147..aad5cfe 100644
--- a/lib_source/qml/RibbonWindow.qml
+++ b/lib_source/qml/RibbonWindow.qml
@@ -18,6 +18,8 @@ Window {
     property bool comfirmed_quit: false
     property bool blurBehindWindow: true
     property int windows_top_fix: Qt.platform.os === 'windows' ? 1 : 0 // a trick to fix Qt or QWindowKit's bug
+    readonly property int borderWidth: border_rect.border.width
+    readonly property int borderRadius: border_rect.radius
     visible: false
     color: {
         if (blurBehindWindow) {