From: Claudio Cambra Date: Tue, 23 May 2023 15:27:30 +0000 (+0800) Subject: Fix dark mode switching issues with main tray window X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~26^2~11 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9ee669a750c7c36b645d1c14cba72c6d2c401414;p=nextcloud-desktop.git Fix dark mode switching issues with main tray window Signed-off-by: Claudio Cambra --- diff --git a/src/gui/filedetails/ShareDetailsPage.qml b/src/gui/filedetails/ShareDetailsPage.qml index 9b1d49ad0..8ef021527 100644 --- a/src/gui/filedetails/ShareDetailsPage.qml +++ b/src/gui/filedetails/ShareDetailsPage.qml @@ -166,6 +166,9 @@ Page { text: Style.ncTextColor windowText: Style.ncTextColor buttonText: Style.ncTextColor + brightText: Style.ncTextBrightColor + highlight: Style.lightHover + highlightedText: Style.ncTextColor light: Style.lightHover midlight: Style.lightHover mid: Style.ncSecondaryTextColor @@ -173,6 +176,8 @@ Page { button: Style.menuBorder window: Style.backgroundColor base: Style.backgroundColor + toolTipBase: Style.backgroundColor + toolTipText: Style.ncTextColor } background: Rectangle { diff --git a/src/gui/filedetails/ShareView.qml b/src/gui/filedetails/ShareView.qml index 528936645..07d8c90b8 100644 --- a/src/gui/filedetails/ShareView.qml +++ b/src/gui/filedetails/ShareView.qml @@ -99,6 +99,9 @@ ColumnLayout { text: Style.ncTextColor windowText: Style.ncTextColor buttonText: Style.ncTextColor + brightText: Style.ncTextBrightColor + highlight: Style.lightHover + highlightedText: Style.ncTextColor light: Style.lightHover midlight: Style.lightHover mid: Style.ncSecondaryTextColor @@ -106,6 +109,8 @@ ColumnLayout { button: Style.menuBorder window: Style.backgroundColor base: Style.backgroundColor + toolTipBase: Style.backgroundColor + toolTipText: Style.ncTextColor } visible: false diff --git a/src/gui/filedetails/ShareeSearchField.qml b/src/gui/filedetails/ShareeSearchField.qml index c3dd98731..0f24c2c41 100644 --- a/src/gui/filedetails/ShareeSearchField.qml +++ b/src/gui/filedetails/ShareeSearchField.qml @@ -178,6 +178,9 @@ TextField { text: Style.ncTextColor windowText: Style.ncTextColor buttonText: Style.ncTextColor + brightText: Style.ncTextBrightColor + highlight: Style.lightHover + highlightedText: Style.ncTextColor light: Style.lightHover midlight: Style.lightHover mid: Style.ncSecondaryTextColor @@ -185,6 +188,8 @@ TextField { button: Style.menuBorder window: Style.backgroundColor base: Style.backgroundColor + toolTipBase: Style.backgroundColor + toolTipText: Style.ncTextColor } contentItem: ScrollView { diff --git a/src/gui/tray/ActivityItem.qml b/src/gui/tray/ActivityItem.qml index 2cac0580b..88ff40472 100644 --- a/src/gui/tray/ActivityItem.qml +++ b/src/gui/tray/ActivityItem.qml @@ -18,6 +18,26 @@ ItemDelegate { readonly property bool isTalkReplyPossible: model.conversationToken !== "" property bool isTalkReplyOptionVisible: model.messageSent !== "" + // TODO: Rather than setting all these palette colours manually, + // create a custom style and do it for all components globally + palette { + text: Style.ncTextColor + windowText: Style.ncTextColor + buttonText: Style.ncTextColor + brightText: Style.ncTextBrightColor + highlight: Style.lightHover + highlightedText: Style.ncTextColor + light: Style.lightHover + midlight: Style.lightHover + mid: Style.ncSecondaryTextColor + dark: Style.menuBorder + button: Style.menuBorder + window: Style.backgroundColor + base: Style.backgroundColor + toolTipBase: Style.backgroundColor + toolTipText: Style.ncTextColor + } + padding: Style.standardSpacing Accessible.role: Accessible.ListItem diff --git a/src/gui/tray/ActivityList.qml b/src/gui/tray/ActivityList.qml index 436a79e5b..67943f3af 100644 --- a/src/gui/tray/ActivityList.qml +++ b/src/gui/tray/ActivityList.qml @@ -14,6 +14,26 @@ ScrollView { signal openFile(string filePath) signal activityItemClicked(int index) + // TODO: Rather than setting all these palette colours manually, + // create a custom style and do it for all components globally + palette { + text: Style.ncTextColor + windowText: Style.ncTextColor + buttonText: Style.ncTextColor + brightText: Style.ncTextBrightColor + highlight: Style.lightHover + highlightedText: Style.ncTextColor + light: Style.lightHover + midlight: Style.lightHover + mid: Style.ncSecondaryTextColor + dark: Style.menuBorder + button: Style.menuBorder + window: Style.backgroundColor + base: Style.backgroundColor + toolTipBase: Style.backgroundColor + toolTipText: Style.ncTextColor + } + contentWidth: availableWidth padding: 0 focus: false diff --git a/src/gui/tray/SyncStatus.qml b/src/gui/tray/SyncStatus.qml index fccf41cd3..deb481161 100644 --- a/src/gui/tray/SyncStatus.qml +++ b/src/gui/tray/SyncStatus.qml @@ -75,6 +75,9 @@ RowLayout { text: Style.ncTextColor windowText: Style.ncTextColor buttonText: Style.ncTextColor + brightText: Style.ncTextBrightColor + highlight: Style.lightHover + highlightedText: Style.ncTextColor light: Style.lightHover midlight: Style.lightHover mid: Style.ncSecondaryTextColor @@ -82,6 +85,8 @@ RowLayout { button: Style.menuBorder window: Style.backgroundColor base: Style.backgroundColor + toolTipBase: Style.backgroundColor + toolTipText: Style.ncTextColor } value: syncStatus.syncProgress diff --git a/src/gui/tray/TrayFoldersMenuButton.qml b/src/gui/tray/TrayFoldersMenuButton.qml index f267f61ee..79cf4a1cd 100644 --- a/src/gui/tray/TrayFoldersMenuButton.qml +++ b/src/gui/tray/TrayFoldersMenuButton.qml @@ -44,7 +44,6 @@ HeaderButton { visible: currentUser.hasLocalFolder display: AbstractButton.IconOnly flat: true - palette: Style.systemPalette Accessible.role: root.userHasGroupFolders ? Accessible.ButtonMenu : Accessible.Button Accessible.name: tooltip.text diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml index 03d592e76..4e347a2f8 100644 --- a/src/gui/tray/Window.qml +++ b/src/gui/tray/Window.qml @@ -257,7 +257,6 @@ ApplicationWindow { Layout.preferredHeight: Style.trayWindowHeaderHeight display: AbstractButton.IconOnly flat: true - palette: Style.systemPalette Accessible.role: Accessible.ButtonMenu Accessible.name: qsTr("Current account") @@ -285,7 +284,26 @@ ApplicationWindow { width: (Style.currentAccountButtonWidth - 2) height: Math.min(implicitHeight, maxMenuHeight) closePolicy: Menu.CloseOnPressOutsideParent | Menu.CloseOnEscape - palette: Style.palette + + // TODO: Rather than setting all these palette colours manually, + // create a custom style and do it for all components globally + palette { + text: Style.ncTextColor + windowText: Style.ncTextColor + buttonText: Style.ncTextColor + brightText: Style.ncTextBrightColor + highlight: Style.lightHover + highlightedText: Style.ncTextColor + light: Style.lightHover + midlight: Style.lightHover + mid: Style.ncSecondaryTextColor + dark: Style.menuBorder + button: Style.menuBorder + window: Style.backgroundColor + base: Style.backgroundColor + toolTipBase: Style.backgroundColor + toolTipText: Style.ncTextColor + } background: Rectangle { border.color: Style.menuBorder @@ -334,7 +352,6 @@ ApplicationWindow { id: addAccountButton height: Style.addAccountButtonHeight hoverEnabled: true - palette: Theme.systemPalette background: Item { height: parent.height @@ -386,7 +403,6 @@ ApplicationWindow { MenuItem { id: syncPauseButton font.pixelSize: Style.topLinePixelSize - palette.windowText: Style.ncTextColor hoverEnabled: true onClicked: Systray.syncIsPaused = !Systray.syncIsPaused @@ -409,7 +425,6 @@ ApplicationWindow { id: settingsButton text: qsTr("Settings") font.pixelSize: Style.topLinePixelSize - palette.windowText: Style.ncTextColor hoverEnabled: true onClicked: Systray.openSettings() @@ -432,7 +447,6 @@ ApplicationWindow { id: exitButton text: qsTr("Exit"); font.pixelSize: Style.topLinePixelSize - palette.windowText: Style.ncTextColor hoverEnabled: true onClicked: Systray.shutdown() @@ -655,6 +669,26 @@ ApplicationWindow { height: implicitHeight + y > Style.trayWindowHeight ? Style.trayWindowHeight - y : implicitHeight closePolicy: Menu.CloseOnPressOutsideParent | Menu.CloseOnEscape + // TODO: Rather than setting all these palette colours manually, + // create a custom style and do it for all components globally + palette { + text: Style.ncTextColor + windowText: Style.ncTextColor + buttonText: Style.ncTextColor + brightText: Style.ncTextBrightColor + highlight: Style.lightHover + highlightedText: Style.ncTextColor + light: Style.lightHover + midlight: Style.lightHover + mid: Style.ncSecondaryTextColor + dark: Style.menuBorder + button: Style.menuBorder + window: Style.backgroundColor + base: Style.backgroundColor + toolTipBase: Style.backgroundColor + toolTipText: Style.ncTextColor + } + background: Rectangle { border.color: Style.menuBorder color: Style.backgroundColor @@ -682,7 +716,6 @@ ApplicationWindow { text: model.appName font.pixelSize: Style.topLinePixelSize - palette.windowText: Style.ncTextColor icon.source: model.appIconUrl icon.color: Style.ncTextColor onTriggered: UserAppsModel.openAppUrl(appUrl) diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml index d16a6b821..9a7a69f48 100644 --- a/theme/Style/Style.qml +++ b/theme/Style/Style.qml @@ -11,6 +11,7 @@ QtObject { // Colors readonly property color ncBlue: Theme.wizardHeaderBackgroundColor readonly property color ncTextColor: Theme.systemPalette.windowText + readonly property color ncTextBrightColor: "white" readonly property color ncSecondaryTextColor: "#808080" readonly property color ncHeaderTextColor: "white" readonly property color lightHover: Theme.darkMode ? Qt.lighter(backgroundColor, 2) : Qt.darker(backgroundColor, 1.05)