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

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>

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