From bbd988d8c511df2ce1469f1f3aa8ebc63d857cb7 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Sat, 19 Mar 2022 13:42:32 +0100 Subject: [PATCH] Fixes to UI issues Signed-off-by: Claudio Cambra --- src/gui/systray.cpp | 2 +- src/gui/tray/ActivityItem.qml | 2 +- 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 4a6391d8c9..fb9742830a 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 3808d5b003..b9bc78b26e 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 132ff7a50b..5cb2220c46 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