mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-24 13:25:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

Allow text to expand further if one or both buttons aren't visible

Browse source 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
This commit is contained in:
Dominique Fuchs 2020-01-15 19:15:25 +01:00
parent 0ec2291bd7
commit 9b32ebdae4
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -512,7 +512,7 @@ Window {
Text { Text {
id: activityTextTitle id: activityTextTitle
text: (type === "Activity") ? subject : message text: (type === "Activity") ? subject : message
width: 236 width: 240 + ((path === "") ? activityItem.height : 0) + ((link === "") ? activityItem.height : 0) - 8
elide: Text.ElideRight elide: Text.ElideRight
font.pixelSize: 12 font.pixelSize: 12
} }
@ -521,7 +521,7 @@ Window {
id: activityTextInfo id: activityTextInfo
text: displaypath text: displaypath
height: (displaypath === "") ? 0 : activityTextTitle.height height: (displaypath === "") ? 0 : activityTextTitle.height
width: 236 width: 240 + ((path === "") ? activityItem.height : 0) + ((link === "") ? activityItem.height : 0) - 8
elide: Text.ElideRight elide: Text.ElideRight
font.pixelSize: 10 font.pixelSize: 10
} }
@ -532,12 +532,12 @@ Window {
} }
Button { Button {
id: activityButton1 id: activityButton1
Layout.preferredWidth: activityItem.height Layout.preferredWidth: (path === "") ? 0 : activityItem.height
Layout.preferredHeight: activityItem.height Layout.preferredHeight: activityItem.height
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
flat: true flat: true
hoverEnabled: false hoverEnabled: false
visible: (path !== "") ? true : false visible: (path === "") ? false : true
display: AbstractButton.IconOnly display: AbstractButton.IconOnly
icon.source: "qrc:///client/resources/files.svg" icon.source: "qrc:///client/resources/files.svg"
icon.color: "transparent" icon.color: "transparent"
@ -547,12 +547,13 @@ Window {
} }
} }
Button { Button {
Layout.preferredWidth: activityItem.height id: activityButton2
Layout.preferredHeight: activityItem.height Layout.preferredWidth: (link === "") ? 0 : activityItem.height
Layout.preferredHeight: activityItem.height
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
flat: true flat: true
hoverEnabled: false hoverEnabled: false
visible: (link !== "") ? true : false visible: (link === "") ? false : true
display: AbstractButton.IconOnly display: AbstractButton.IconOnly
icon.source: "qrc:///client/resources/public.svg" icon.source: "qrc:///client/resources/public.svg"
icon.color: "transparent" icon.color: "transparent"