mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4363 from nextcloud/bugfix/ui-fix

Browse Source 
Fix icon color and highlight color issues
This commit is contained in:
Claudio Cambra 2022-03-20 17:55:50 +01:00 committed by GitHub
commit c0503ce7bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/systray.cpp
View File

@ -241,7 +241,7 @@ bool Systray::darkMode()
if (!Utility::registryKeyExists(HKEY_CURRENT_USER, darkModeSubkey)) {
return false;
}
const auto darkMode = Utility::registryGetKeyValue(HKEY_CURRENT_USER, darkModeSubkey, QStringLiteral("AppsUseLightTheme")).toBool();
const auto darkMode = !Utility::registryGetKeyValue(HKEY_CURRENT_USER, darkModeSubkey, QStringLiteral("AppsUseLightTheme")).toBool();
return darkMode;
// Probably Linux
#else

2
src/gui/tray/ActivityItem.qml
View File

@ -64,7 +64,7 @@ MouseArea {
activityData: model
Layout.preferredHeight: Style.trayWindowHeaderHeight
Layout.minimumHeight: Style.trayWindowHeaderHeight
onShareButtonClicked: Systray.openShareDialog(model.displayPath, model.absolutePath)
onDismissButtonClicked: activityModel.slotTriggerDismiss(model.index)

2
theme/Style/Style.qml
View File

@ -12,7 +12,7 @@ QtObject {
readonly property color ncTextColor: Theme.systemPalette.windowText
readonly property color ncSecondaryTextColor: "#808080"
readonly property color ncHeaderTextColor: "white"
readonly property color lightHover: Theme.systemPalette.highlight
readonly property color lightHover: Systray.darkMode ? Qt.lighter(backgroundColor, 2) : Qt.darker(backgroundColor, 1.05)
readonly property color menuBorder: Systray.darkMode ? Qt.lighter(backgroundColor, 3) : Qt.darker(backgroundColor, 1.5)
readonly property color backgroundColor: Theme.systemPalette.base