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

Remove more color customizations from Window and TrayFoldersMenuButton.

Browse source 
Signed-off-by: Camila Ayres <hello@camilasan.com>
This commit is contained in:
Camila Ayres 2024-09-03 21:18:19 +02:00 committed by Matthieu Gallien
parent 6b5041a55e
commit d05ebc33c9
2 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gui/tray/TrayFoldersMenuButton.qml
View file

@ -91,7 +91,6 @@ HeaderButton {
width: Style.folderStateIndicatorSize + Style.trayFolderStatusIndicatorSizeOffset
height: width
anchors.centerIn: parent
color: Style.currentUserHeaderColor
radius: width * Style.trayFolderStatusIndicatorRadiusFactor
z: -2
}
@ -101,7 +100,6 @@ HeaderButton {
width: Style.folderStateIndicatorSize + Style.trayFolderStatusIndicatorSizeOffset
height: width
anchors.centerIn: parent
color: root.hovered ? Style.currentUserHeaderTextColor : palette.window
opacity: Style.trayFolderStatusIndicatorMouseHoverOpacityFactor
radius: width * Style.trayFolderStatusIndicatorRadiusFactor
z: -1
@ -116,7 +114,7 @@ HeaderButton {
cache: true
source: "image://svgimage-custom-color/folder.svg/" + Style.currentUserHeaderTextColor
source: "image://svgimage-custom-color/folder.svg/"
sourceSize {
width: imageWidth
height: imageHeight
@ -146,7 +144,7 @@ HeaderButton {
cache: true
source: "image://svgimage-custom-color/caret-down.svg/" + Style.currentUserHeaderTextColor
source: "image://svgimage-custom-color/caret-down.svg/"
sourceSize {
width: openLocalFolderButtonCaretIconLoader.imageWidth
height: openLocalFolderButtonCaretIconLoader.imageHeight
@ -210,9 +208,9 @@ HeaderButton {
subline: model.modelData.parentPath
width: foldersMenuListView.width
height: Style.standardPrimaryButtonHeight
backgroundIconSource: "image://svgimage-custom-color/folder.svg/" + palette.buttonText
backgroundIconSource: "image://svgimage-custom-color/folder.svg/"
iconSource: isGroupFolder
? "image://svgimage-custom-color/account-group.svg/" + palette.brightText
? "image://svgimage-custom-color/account-group.svg/"
: ""
onTriggered: {

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

@ -507,7 +507,6 @@ ApplicationWindow {
ColorOverlay {
cached: true
color: Style.currentUserHeaderTextColor
width: source.width
height: source.height
source: Image {
@ -535,7 +534,6 @@ ApplicationWindow {
visible: currentUser.hasLocalFolder
currentUser: UserModel.currentUser
onClicked: openLocalFolderButton.userHasGroupFolders ? openLocalFolderButton.toggleMenuOpen() : UserModel.openCurrentAccountLocalFolder()
onFolderEntryTriggered: isGroupFolder ? UserModel.openCurrentAccountFolderFromTrayInfo(fullFolderPath) : UserModel.openCurrentAccountLocalFolder()
@ -552,7 +550,7 @@ ApplicationWindow {
HeaderButton {
id: trayWindowFeaturedAppButton
visible: UserModel.currentUser.isFeaturedAppEnabled
icon.source: UserModel.currentUser.featuredAppIcon + "/" + Style.currentUserHeaderTextColor
icon.source: UserModel.currentUser.featuredAppIcon + "/"
onClicked: UserModel.openCurrentAccountFeaturedApp()
Accessible.role: Accessible.Button
@ -566,7 +564,7 @@ ApplicationWindow {
HeaderButton {
id: trayWindowAppsButton
icon.source: "image://svgimage-custom-color/more-apps.svg" + "/" + Style.currentUserHeaderTextColor
icon.source: "image://svgimage-custom-color/more-apps.svg/"
onClicked: {
if(appsMenuListView.count <= 0) {
@ -614,24 +612,11 @@ ApplicationWindow {
id: appEntry
anchors.left: parent.left
anchors.right: parent.right
text: model.appName
font.pixelSize: Style.topLinePixelSize
icon.source: model.appIconUrl
icon.color: palette.buttonText
onTriggered: UserAppsModel.openAppUrl(appUrl)
hoverEnabled: true
// background: Item {
// height: parent.height
// width: parent.width
// Rectangle {
// anchors.fill: parent
// anchors.margins: 1
// color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.window
// }
// }
Accessible.role: Accessible.MenuItem
Accessible.name: qsTr("Open %1 in browser").arg(model.appName)
Accessible.onPressAction: appEntry.triggered()