diff options
| author | Claudio Cambra <claudio.cambra@gmail.com> | 2022-03-20 19:55:50 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-20 19:55:50 +0300 |
| commit | c0503ce7bf3cf676ef0cdbd9ec3d53cf876b4d62 (patch) | |
| tree | 45f2e6e18eb09467655e0eec5f841bf51f02095e | |
| parent | 172f6929d4e6bd94996558549ab15cea89ea6977 (diff) | |
| parent | bbd988d8c511df2ce1469f1f3aa8ebc63d857cb7 (diff) | |
Merge pull request #4363 from nextcloud/bugfix/ui-fixv3.5.0-rc1
Fix icon color and highlight color issues
| -rw-r--r-- | src/gui/systray.cpp | 2 | ||||
| -rw-r--r-- | src/gui/tray/ActivityItem.qml | 2 | ||||
| -rw-r--r-- | theme/Style/Style.qml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp index 4a6391d8c..fb9742830 100644 --- a/src/gui/systray.cpp +++ b/src/gui/systray.cpp @@ -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 diff --git a/src/gui/tray/ActivityItem.qml b/src/gui/tray/ActivityItem.qml index 3808d5b00..b9bc78b26 100644 --- a/src/gui/tray/ActivityItem.qml +++ b/src/gui/tray/ActivityItem.qml @@ -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) diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml index 132ff7a50..5cb2220c4 100644 --- a/theme/Style/Style.qml +++ b/theme/Style/Style.qml @@ -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
|