From 874aaa35a01cd7f05969645b2f6094f372705cf2 Mon Sep 17 00:00:00 2001
From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Tue, 19 Nov 2024 10:31:30 +0800
Subject: [PATCH] Remove menuBorder Style variable, just use palette (as we
 have already done in parts)

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---
 src/gui/tray/NCProgressBar.qml | 6 +++---
 theme/Style/Style.qml          | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/gui/tray/NCProgressBar.qml b/src/gui/tray/NCProgressBar.qml
index c620f149a..5c0d2afb3 100644
--- a/src/gui/tray/NCProgressBar.qml
+++ b/src/gui/tray/NCProgressBar.qml
@@ -24,7 +24,7 @@ ProgressBar {
         implicitHeight: Style.progressBarBackgroundHeight
         radius: Style.progressBarRadius
         color: Style.progressBarBackgroundColor
-        border.color: Style.progressBarBackgroundBorderColor
+        border.color: palette.dark
         border.width: Style.progressBarBackgroundBorderWidth
     }
 
@@ -36,8 +36,8 @@ ProgressBar {
             width: control.visualPosition * parent.width
             height: parent.height
             radius: Style.progressBarRadius
-            color: Style.progressBarContentColor
-            border.color: Style.progressBarContentBorderColor
+            color: palette.dark
+            border.color: palette.dark
             border.width: Style.progressBarContentBorderWidth
         }
     }
diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index d145b16c3..4ae40a68f 100644
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -16,7 +16,6 @@ QtObject {
     readonly property color ncSecondaryTextColor: "#808080"
     readonly property color lightHover: Theme.darkMode ? Qt.lighter(backgroundColor, 2) : Qt.darker(backgroundColor, 1.05)
     readonly property color darkerHover: Theme.darkMode ? Qt.lighter(backgroundColor, 2.35) : Qt.darker(backgroundColor, 1.25)
-    readonly property color menuBorder: Theme.darkMode ? Qt.lighter(backgroundColor, 2.5) : Qt.darker(backgroundColor, 1.5)
     readonly property color backgroundColor: Theme.systemPalette.base
     readonly property color buttonBackgroundColor: Theme.systemPalette.button
     readonly property color positiveColor: Qt.rgba(0.38, 0.74, 0.38, 1)
@@ -194,9 +193,7 @@ QtObject {
     property int progressBarContentBorderWidth: 1
     property int progressBarBackgroundBorderWidth: 1
     property color progressBarContentColor: ncBlue
-    property color progressBarContentBorderColor: menuBorder
     property color progressBarBackgroundColor: backgroundColor
-    property color progressBarBackgroundBorderColor: menuBorder
 
     property int newActivitiesButtonWidth: 150
     property int newActivitiesButtonHeight: 40
-- 
2.30.2