From 5ce736222e6fe84855e70b3faa60186f769cf1bf Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Thu, 14 Apr 2022 00:06:28 +0200 Subject: [PATCH] Use header text color to improve contrast with header colours when hovering on themed elements Signed-off-by: Claudio Cambra --- src/gui/tray/ActivityItemContent.qml | 2 +- src/gui/tray/HeaderButton.qml | 3 ++- src/gui/tray/Window.qml | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml index 4b4f1e3ff..d716d76eb 100644 --- a/src/gui/tray/ActivityItemContent.qml +++ b/src/gui/tray/ActivityItemContent.qml @@ -212,7 +212,7 @@ RowLayout { visible: root.activityData.isShareable imageSource: "image://svgimage-custom-color/share.svg" + "/" + UserModel.currentUser.headerColor - imageSourceHover: "image://svgimage-custom-color/share.svg" + "/" + Style.ncTextColor + imageSourceHover: "image://svgimage-custom-color/share.svg" + "/" + UserModel.currentUser.headerTextColor toolTipText: qsTr("Open share dialog") diff --git a/src/gui/tray/HeaderButton.qml b/src/gui/tray/HeaderButton.qml index b6fe6ab86..c10118877 100644 --- a/src/gui/tray/HeaderButton.qml +++ b/src/gui/tray/HeaderButton.qml @@ -8,6 +8,7 @@ import QtGraphicalEffects 1.0 // Custom qml modules are in /theme (and included by resources.qrc) import Style 1.0 +import com.nextcloud.desktopclient 1.0 Button { id: root @@ -25,7 +26,7 @@ Button { Layout.preferredHeight: Style.trayWindowHeaderHeight background: Rectangle { - color: root.hovered || root.visualFocus ? "white" : "transparent" + color: root.hovered || root.visualFocus ? UserModel.currentUser.headerTextColor : "transparent" opacity: 0.2 } } diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml index 2b4ef3f8a..c1c56039c 100644 --- a/src/gui/tray/Window.qml +++ b/src/gui/tray/Window.qml @@ -339,7 +339,7 @@ Window { } background: Rectangle { - color: parent.hovered || parent.visualFocus ? "white" : "transparent" + color: parent.hovered || parent.visualFocus ? UserModel.currentUser.headerTextColor : "transparent" opacity: 0.2 } @@ -383,7 +383,7 @@ Window { height: width anchors.bottom: currentAccountAvatar.bottom anchors.right: currentAccountAvatar.right - color: currentAccountButton.hovered ? "white" : "transparent" + color: currentAccountButton.hovered ? UserModel.currentUser.headerTextColor : "transparent" opacity: 0.2 radius: width*0.5 } @@ -526,7 +526,7 @@ Window { width: Style.folderStateIndicatorSize + 2 height: width anchors.centerIn: parent - color: openLocalFolderButton.hovered ? "white" : "transparent" + color: openLocalFolderButton.hovered ? UserModel.currentUser.headerTextColor : "transparent" opacity: 0.2 radius: width*0.5 z: -1 -- 2.30.2