From 25638f6970694bec4aaec4e745c4b004ea016f4e Mon Sep 17 00:00:00 2001
From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Thu, 14 Nov 2024 19:12:29 +0800
Subject: [PATCH] Fix spacing of activity item buttons

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---
 src/gui/tray/ActivityItemContent.qml | 64 ++++++++++++++--------------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml
index 7569f6e06..32ab5ec01 100644
--- a/src/gui/tray/ActivityItemContent.qml
+++ b/src/gui/tray/ActivityItemContent.qml
@@ -124,8 +124,6 @@ RowLayout {
         RowLayout {
             Layout.fillWidth: true
 
-            spacing: Style.trayHorizontalMargin
-
             EnforcedPlainTextLabel {
                 id: activityTextTitle
                 text: (root.activityData.type === "Activity" || root.activityData.type === "Notification") ? root.activityData.subject : root.activityData.message
@@ -156,55 +154,55 @@ RowLayout {
                 visible: text !== ""
             }
 
-            CustomButton {
-                id: fileDetailsButton
-
-                Layout.preferredWidth: Style.activityListButtonWidth
-                Layout.preferredHeight: Style.activityListButtonHeight
+            Row {
                 Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+                spacing: Style.extraSmallSpacing
 
-                icon.source: "image://svgimage-custom-color/more.svg/" + palette.buttonText
-                icon.width: Style.activityListButtonIconSize
-                icon.height: Style.activityListButtonIconSize
+                CustomButton {
+                    id: fileDetailsButton
 
-                ToolTip {
-                    text: qsTr("Open file details")
-                    visible: parent.hovered
-                }
+                    width: Style.activityListButtonWidth
+                    height: Style.activityListButtonHeight
 
-                display: Button.IconOnly
+                    icon.source: "image://svgimage-custom-color/more.svg/" + palette.buttonText
+                    icon.width: Style.activityListButtonIconSize
+                    icon.height: Style.activityListButtonIconSize
 
-                visible: model.showFileDetails
+                    ToolTip {
+                        text: qsTr("Open file details")
+                        visible: parent.hovered
+                    }
 
-                onClicked: Systray.presentShareViewInTray(model.openablePath)
-            }
+                    display: Button.IconOnly
+                    visible: model.showFileDetails
+                    onClicked: Systray.presentShareViewInTray(model.openablePath)
+                }
 
-            CustomButton {
-                id: dismissActionButton
+                CustomButton {
+                    id: dismissActionButton
 
-                Layout.preferredWidth: Style.activityListButtonWidth
-                Layout.preferredHeight: Style.activityListButtonHeight
-                Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+                    width: Style.activityListButtonWidth
+                    height: Style.activityListButtonHeight
 
-                icon.source: "image://svgimage-custom-color/clear.svg/" + palette.buttonText
-                icon.width: Style.activityListButtonIconSize
-                icon.height: Style.activityListButtonIconSize
+                    icon.source: "image://svgimage-custom-color/clear.svg/" + palette.buttonText
+                    icon.width: Style.activityListButtonIconSize
+                    icon.height: Style.activityListButtonIconSize
 
-                display: Button.IconOnly
+                    display: Button.IconOnly
 
-                ToolTip {
-                    text: qsTr("Dismiss")
-                    visible: parent.hovered
-                }
+                    ToolTip {
+                        text: qsTr("Dismiss")
+                        visible: parent.hovered
+                    }
 
-                onClicked: root.dismissButtonClicked()
+                    onClicked: root.dismissButtonClicked()
+                }
             }
         }
 
         RowLayout {
             Layout.fillWidth: true
             Layout.fillHeight: true
-            spacing: Style.trayHorizontalMargin
             visible: activityTextInfo.visible || talkReplyMessageSent.visible || activityActions.visible
 
             EnforcedPlainTextLabel {
-- 
2.39.5