Fix alignment and size of buttons.

Signed-off-by: Camila Ayres <hello@camilasan.com>

diff --git a/src/gui/filedetails/FileDetailsPage.qml b/src/gui/filedetails/FileDetailsPage.qml
index 2c495bf6004c613a0550594b27d845c00f4b3da4..6c0bac5af3899c7505c7c450f767d2303494b74d 100644 (file)
--- a/src/gui/filedetails/FileDetailsPage.qml
+++ b/src/gui/filedetails/FileDetailsPage.qml
@@ -134,11 +134,14 @@ Page {
                 id: closeButton
 
                 Layout.rowSpan: headerGridLayout.rows
-                Layout.preferredWidth: Style.iconButtonWidth
-                Layout.preferredHeight: width
+                Layout.preferredWidth: Style.activityListButtonWidth
+                Layout.preferredHeight: Style.activityListButtonHeight
+                Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
                 Layout.rightMargin: headerGridLayout.textRightMargin
 
                 icon.source: "image://svgimage-custom-color/clear.svg" + "/" + palette.buttonText
+                icon.width: Style.activityListButtonIconSize
+                icon.height: Style.activityListButtonIconSize
                 toolTipText: qsTr("Dismiss")
 
                 visible: root.showCloseButton

diff --git a/src/gui/filedetails/ShareDelegate.qml b/src/gui/filedetails/ShareDelegate.qml
index 45838ae44db07f22342956d6847cdfd92434f417..09dbb233584c76d74193b49d250c169bbacdb4b8 100644 (file)
--- a/src/gui/filedetails/ShareDelegate.qml
+++ b/src/gui/filedetails/ShareDelegate.qml
@@ -186,9 +186,9 @@ GridLayout {
 
             property bool shareLinkCopied: false
 
-            Layout.alignment: Qt.AlignCenter
-            Layout.preferredWidth: shareLinkCopied ? implicitWidth : Style.iconButtonWidth
-            Layout.preferredHeight: Style.iconButtonWidth
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+            Layout.preferredWidth: shareLinkCopied ? implicitWidth : Style.activityListButtonWidth
+            Layout.preferredHeight: Style.activityListButtonHeight
 
             toolTipText: qsTr("Copy share link location")
 
@@ -232,15 +232,15 @@ GridLayout {
         CustomButton {
             id: moreButton
 
-            Layout.alignment: Qt.AlignCenter
-            Layout.preferredWidth: Style.iconButtonWidth
-            Layout.preferredHeight: width
-
             toolTipText: qsTr("Share options")
 
+            Layout.preferredWidth: Style.activityListButtonWidth
+            Layout.preferredHeight: Style.activityListButtonHeight
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+
             icon.source: "image://svgimage-custom-color/more.svg/" + palette.buttonText
-            icon.width: Style.smallIconSize
-            icon.height: Style.smallIconSize
+            icon.width: Style.activityListButtonIconSize
+            icon.height: Style.activityListButtonIconSize
 
             visible: !root.isPlaceholderLinkShare && !root.isSecureFileDropPlaceholderLinkShare && !root.isInternalLinkShare
             enabled: visible

diff --git a/src/gui/filedetails/ShareDetailsPage.qml b/src/gui/filedetails/ShareDetailsPage.qml
index 223468ee9b168a36bdb12f4b6d349f69ac5328d6..bdb3ca96f0738dbac8bd3bd7cf8230c4f864d728 100644 (file)
--- a/src/gui/filedetails/ShareDetailsPage.qml
+++ b/src/gui/filedetails/ShareDetailsPage.qml
@@ -224,11 +224,14 @@ Page {
                 id: closeButton
 
                 Layout.rowSpan: headerGridLayout.rows
-                Layout.preferredWidth: Style.iconButtonWidth
-                Layout.preferredHeight: width
+                Layout.preferredWidth: Style.activityListButtonWidth
+                Layout.preferredHeight: Style.activityListButtonHeight
+                Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
                 Layout.rightMargin: root.padding
 
                 icon.source: "image://svgimage-custom-color/clear.svg" + "/" + palette.buttonText
+                icon.width: Style.activityListButtonIconSize
+                icon.height: Style.activityListButtonIconSize
                 toolTipText: qsTr("Dismiss")
 
                 onClicked: root.closeShareDetails()
@@ -764,7 +767,13 @@ Page {
 
             height: Style.standardPrimaryButtonHeight
 
+            Layout.preferredWidth: Style.activityListButtonWidth
+            Layout.preferredHeight: Style.activityListButtonHeight
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+
             icon.source: "image://svgimage-custom-color/copy.svg/" + palette.brightText
+            icon.width: Style.smallIconSize
+            icon.height: Style.smallIconSize
             text: shareLinkCopied ? qsTr("Share link copied!") : qsTr("Copy share link")
             visible: root.isLinkShare
             enabled: visible

diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml
index afd7a6dbff091f2c748ed8954a51e85792ec14fe..7569f6e06c02e8cafeb03ae72f7085b082b6e614 100644 (file)
--- a/src/gui/tray/ActivityItemContent.qml
+++ b/src/gui/tray/ActivityItemContent.qml
@@ -159,11 +159,13 @@ RowLayout {
             CustomButton {
                 id: fileDetailsButton
 
-                Layout.preferredWidth: Style.dismissButtonSize
-                Layout.preferredHeight: Style.dismissButtonSize
-                Layout.alignment: Qt.AlignTop | Qt.AlignRight
+                Layout.preferredWidth: Style.activityListButtonWidth
+                Layout.preferredHeight: Style.activityListButtonHeight
+                Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
 
                 icon.source: "image://svgimage-custom-color/more.svg/" + palette.buttonText
+                icon.width: Style.activityListButtonIconSize
+                icon.height: Style.activityListButtonIconSize
 
                 ToolTip {
                     text: qsTr("Open file details")
@@ -171,8 +173,6 @@ RowLayout {
                 }
 
                 display: Button.IconOnly
-                leftPadding: 0
-                rightPadding: 0
 
                 visible: model.showFileDetails
 
@@ -182,17 +182,15 @@ RowLayout {
             CustomButton {
                 id: dismissActionButton
 
-                Layout.preferredWidth: Style.dismissButtonSize
-                Layout.preferredHeight: Style.dismissButtonSize
-                Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
-
-                visible: root.showDismissButton && !fileDetailsButton.visible
+                Layout.preferredWidth: Style.activityListButtonWidth
+                Layout.preferredHeight: Style.activityListButtonHeight
+                Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
 
                 icon.source: "image://svgimage-custom-color/clear.svg/" + palette.buttonText
+                icon.width: Style.activityListButtonIconSize
+                icon.height: Style.activityListButtonIconSize
 
                 display: Button.IconOnly
-                leftPadding: 0
-                rightPadding: 0
 
                 ToolTip {
                     text: qsTr("Dismiss")

diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index f48f885e97c7df021acfcd2ef86ed5057bda3ddb..912aa10b8167b8f8d28860ed6a16a2912a3b1c1a 100644 (file)
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -105,6 +105,9 @@ QtObject {
 \r
     property int addAccountButtonHeight: 50\r
 \r
+    property int activityListButtonWidth: 42\r
+    property int activityListButtonHeight: 32\r
+    property int activityListButtonIconSize: 18\r
     property int headerButtonIconSize: 32\r
     property int addButtonIconSize: 26\r
     property int dismissButtonSize: 26\r