mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-28 11:48:56 +03:00
Code Issues Projects Releases Packages Wiki Activity

Give sync progress bar expected fill colour

Browse source 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

f p

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
Claudio Cambra 2024-11-19 11:07:04 +08:00
parent a8982465a9
commit fab03f2369
No known key found for this signature in database
GPG key ID: C839200C384636B0
4 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gui/tray/MainWindow.qml
View file

@ -708,6 +708,7 @@ ApplicationWindow {
SyncStatus { SyncStatus {
id: syncStatus id: syncStatus
accentColor: Style.accentColor
visible: !trayWindowMainItem.isUnifiedSearchActive visible: !trayWindowMainItem.isUnifiedSearchActive
anchors.top: trayWindowUnifiedSearchInputContainer.bottom anchors.top: trayWindowUnifiedSearchInputContainer.bottom

5
src/gui/tray/NCProgressBar.qml
View file

@ -16,9 +16,12 @@ import QtQuick
import QtQuick.Controls import QtQuick.Controls
import Style import Style
// TODO: the current style does not support customization of this control
ProgressBar { ProgressBar {
id: control id: control
property color fillColor: Style.ncBlue
background: Rectangle { background: Rectangle {
implicitWidth: Style.progressBarWidth implicitWidth: Style.progressBarWidth
implicitHeight: Style.progressBarBackgroundHeight implicitHeight: Style.progressBarBackgroundHeight
@ -36,7 +39,7 @@ ProgressBar {
width: control.visualPosition * parent.width width: control.visualPosition * parent.width
height: parent.height height: parent.height
radius: Style.progressBarRadius radius: Style.progressBarRadius
color: palette.dark color: control.fillColor
border.color: palette.dark border.color: palette.dark
border.width: Style.progressBarContentBorderWidth border.width: Style.progressBarContentBorderWidth
} }

2
src/gui/tray/SyncStatus.qml
View file

@ -10,6 +10,7 @@ RowLayout {
id: root id: root
property alias model: syncStatus property alias model: syncStatus
property color accentColor: Style.ncBlue
spacing: Style.trayHorizontalMargin spacing: Style.trayHorizontalMargin
@ -69,6 +70,7 @@ RowLayout {
sourceComponent: NCProgressBar { sourceComponent: NCProgressBar {
id: syncProgressBar id: syncProgressBar
value: syncStatus.syncProgress value: syncStatus.syncProgress
fillColor: root.accentColor
} }
} }

1
theme/Style/Style.qml
View file

@ -185,7 +185,6 @@ QtObject {
property int progressBarRadius: 4 property int progressBarRadius: 4
property int progressBarContentBorderWidth: 1 property int progressBarContentBorderWidth: 1
property int progressBarBackgroundBorderWidth: 1 property int progressBarBackgroundBorderWidth: 1
property color progressBarContentColor: ncBlue
property int newActivitiesButtonWidth: 150 property int newActivitiesButtonWidth: 150
property int newActivitiesButtonHeight: 40 property int newActivitiesButtonHeight: 40