Fix spacing of activity item buttons
authorClaudio Cambra <claudio.cambra@nextcloud.com>
Thu, 14 Nov 2024 11:12:29 +0000 (19:12 +0800)
committerClaudio Cambra <claudio.cambra@nextcloud.com>
Thu, 21 Nov 2024 05:20:59 +0000 (13:20 +0800)
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
src/gui/tray/ActivityItemContent.qml

index 7569f6e06c02e8cafeb03ae72f7085b082b6e614..32ab5ec015eea72464db261eb351c1198466d606 100644 (file)
@@ -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 {