mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-29 12:19:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4437 from nextcloud/bugfix/header-color-contrast

Browse source 
Improve contrast on server color themed elements
This commit is contained in:
Matthieu Gallien 2022-04-15 15:10:47 +02:00 committed by GitHub
commit b8ac646f54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/tray/ActivityItemContent.qml
View file

@ -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")

3
src/gui/tray/HeaderButton.qml
View file

@ -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
}
}

6
src/gui/tray/Window.qml
View file

@ -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