From 406bf535bfeaec226ba32b809a48f3103f8578e8 Mon Sep 17 00:00:00 2001
From: Mentalflow <312902918@qq.com>
Date: Fri, 28 Jun 2024 14:45:18 +0800
Subject: [PATCH] RibbonProgressBar: Added more position choice.

---
 lib_source/qml/Qt5/RibbonProgressBar.qml | 6 +++---
 lib_source/qml/Qt5/RibbonTabBar.qml      | 1 +
 lib_source/qml/Qt6/RibbonProgressBar.qml | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib_source/qml/Qt5/RibbonProgressBar.qml b/lib_source/qml/Qt5/RibbonProgressBar.qml
index 2608499..1b173d2 100644
--- a/lib_source/qml/Qt5/RibbonProgressBar.qml
+++ b/lib_source/qml/Qt5/RibbonProgressBar.qml
@@ -6,10 +6,11 @@ import RibbonUI 1.0
 Item{
     id: control
     implicitHeight: (textLabelPosition === RibbonProgressBar.LabelPosition.Top || textLabelPosition === RibbonProgressBar.LabelPosition.Bottom && showText ?
-                         (text_label.contentHeight + textLabelMargin + bar.implicitHeight) : showText ? Math.max(bar.implicitHeight, text_label.contentHeight) : bar.implicitHeight)
+                         (text_label.contentHeight + textLabelMargin + bar.implicitHeight) : showText && textLabelPosition !== RibbonProgressBar.LabelPosition.None ? Math.max(bar.implicitHeight, text_label.contentHeight) : bar.implicitHeight)
     implicitWidth: bar.implicitWidth + (textLabelPosition === RibbonProgressBar.LabelPosition.Left || textLabelPosition === RibbonProgressBar.LabelPosition.Right && showText ?
                                             (text_label.contentWidth + textLabelMargin) : 0)
     enum LabelPosition {
+        None,
         Top,
         Left,
         Right,
@@ -30,6 +31,7 @@ Item{
     property alias position: bar.position
     property alias indeterminate: bar.indeterminate
     property alias bar: bar
+    property alias textLabel: text_label
 
     ProgressBar {
         id: bar
@@ -56,7 +58,6 @@ Item{
             implicitHeight: barHeight
             implicitWidth: barWidth
             height: implicitHeight
-            anchors.verticalCenter: bar.verticalCenter
             clip: true
             layer.enabled: true
             layer.effect: OpacityMask {
@@ -96,7 +97,6 @@ Item{
             implicitHeight: barHeight
             height: barHeight
             radius: height / 2
-            anchors.verticalCenter: bar.verticalCenter
             color: bgColor
         }
     }
diff --git a/lib_source/qml/Qt5/RibbonTabBar.qml b/lib_source/qml/Qt5/RibbonTabBar.qml
index d6c7b20..e08fcc6 100644
--- a/lib_source/qml/Qt5/RibbonTabBar.qml
+++ b/lib_source/qml/Qt5/RibbonTabBar.qml
@@ -286,6 +286,7 @@ Item{
     }
 
     Component.onCompleted: Window.window.tabBar = root
+
     //onModern_styleChanged: refresh()
 
     function addPage(content, is_highlight)
diff --git a/lib_source/qml/Qt6/RibbonProgressBar.qml b/lib_source/qml/Qt6/RibbonProgressBar.qml
index d739713..accc54d 100644
--- a/lib_source/qml/Qt6/RibbonProgressBar.qml
+++ b/lib_source/qml/Qt6/RibbonProgressBar.qml
@@ -6,10 +6,11 @@ import RibbonUI
 Item{
     id: control
     implicitHeight: (textLabelPosition === RibbonProgressBar.LabelPosition.Top || textLabelPosition === RibbonProgressBar.LabelPosition.Bottom && showText ?
-                         (text_label.contentHeight + textLabelMargin + bar.implicitHeight) : showText ? Math.max(bar.implicitHeight, text_label.contentHeight) : bar.implicitHeight)
+                         (text_label.contentHeight + textLabelMargin + bar.implicitHeight) : showText && textLabelPosition !== RibbonProgressBar.LabelPosition.None ? Math.max(bar.implicitHeight, text_label.contentHeight) : bar.implicitHeight)
     implicitWidth: bar.implicitWidth + (textLabelPosition === RibbonProgressBar.LabelPosition.Left || textLabelPosition === RibbonProgressBar.LabelPosition.Right && showText ?
                                             (text_label.contentWidth + textLabelMargin) : 0)
     enum LabelPosition {
+        None,
         Top,
         Left,
         Right,
@@ -30,6 +31,7 @@ Item{
     property alias position: bar.position
     property alias indeterminate: bar.indeterminate
     property alias bar: bar
+    property alias textLabel: text_label
 
     ProgressBar {
         id: bar
@@ -56,7 +58,6 @@ Item{
             implicitHeight: barHeight
             implicitWidth: barWidth
             height: implicitHeight
-            anchors.verticalCenter: bar.verticalCenter
             clip: true
             layer.enabled: true
             layer.effect: OpacityMask {
@@ -96,7 +97,6 @@ Item{
             implicitHeight: barHeight
             height: barHeight
             radius: height / 2
-            anchors.verticalCenter: bar.verticalCenter
             color: bgColor
         }
     }