mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-22 04:55:48 +03:00
Fix displaying of header buttons in tray window
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
parent
04e1736616
commit
78ae106ea0
2 changed files with 18 additions and 4 deletions
|
@ -32,7 +32,6 @@ Button {
|
|||
|
||||
icon.width: Style.headerButtonIconSize
|
||||
icon.height: Style.headerButtonIconSize
|
||||
icon.color: palette.brightText
|
||||
|
||||
Layout.alignment: Qt.AlignRight
|
||||
Layout.preferredWidth: Style.trayWindowHeaderHeight
|
||||
|
@ -42,4 +41,20 @@ Button {
|
|||
color: root.hovered || root.visualFocus ? Style.currentUserHeaderTextColor : "transparent"
|
||||
opacity: 0.2
|
||||
}
|
||||
|
||||
contentItem: Item {
|
||||
anchors.fill: parent
|
||||
|
||||
Image {
|
||||
id: internalImage
|
||||
anchors.centerIn: parent
|
||||
width: root.icon.width
|
||||
height: root.icon.height
|
||||
source: root.icon.source
|
||||
sourceSize {
|
||||
width: root.icon.width
|
||||
height: root.icon.height
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -640,7 +640,7 @@ ApplicationWindow {
|
|||
id: trayWindowTalkButton
|
||||
|
||||
visible: UserModel.currentUser && UserModel.currentUser.serverHasTalk
|
||||
icon.source: "qrc:///client/theme/white/talk-app.svg"
|
||||
icon.source: "image://svgimage-custom-color/talk-app.svg" + "/" + Style.currentUserHeaderTextColor
|
||||
icon.color: Style.currentUserHeaderTextColor
|
||||
onClicked: UserModel.openCurrentAccountTalk()
|
||||
|
||||
|
@ -656,8 +656,7 @@ ApplicationWindow {
|
|||
|
||||
HeaderButton {
|
||||
id: trayWindowAppsButton
|
||||
icon.source: "qrc:///client/theme/white/more-apps.svg"
|
||||
icon.color: Style.currentUserHeaderTextColor
|
||||
icon.source: "image://svgimage-custom-color/more-apps.svg" + "/" + Style.currentUserHeaderTextColor
|
||||
|
||||
onClicked: {
|
||||
if(appsMenuListView.count <= 0) {
|
||||
|
|
Loading…
Reference in a new issue