From 4980e4e98501887da0bdc89c277587b64a7905f4 Mon Sep 17 00:00:00 2001 From: Noah Davis Date: Sun, 30 Aug 2020 21:19:51 -0400 Subject: [PATCH] Use the spacing property for the spacing between Button/ToolButton icons and labels --- src/declarativeimports/plasmacomponents3/Button.qml | 2 ++ src/declarativeimports/plasmacomponents3/ToolButton.qml | 2 ++ .../plasmacomponents3/private/ButtonContent.qml | 3 +++ 3 files changed, 7 insertions(+) diff --git a/src/declarativeimports/plasmacomponents3/Button.qml b/src/declarativeimports/plasmacomponents3/Button.qml index e29716305..0da110b69 100644 --- a/src/declarativeimports/plasmacomponents3/Button.qml +++ b/src/declarativeimports/plasmacomponents3/Button.qml @@ -26,6 +26,8 @@ T.Button { rightPadding: background.rightMargin bottomPadding: background.bottomMargin + spacing: PlasmaCore.Units.smallSpacing + hoverEnabled: !Kirigami.Settings.tabletMode Kirigami.MnemonicData.enabled: control.enabled && control.visible diff --git a/src/declarativeimports/plasmacomponents3/ToolButton.qml b/src/declarativeimports/plasmacomponents3/ToolButton.qml index b032173e6..997839adb 100644 --- a/src/declarativeimports/plasmacomponents3/ToolButton.qml +++ b/src/declarativeimports/plasmacomponents3/ToolButton.qml @@ -26,6 +26,8 @@ T.ToolButton { rightPadding: background.rightMargin bottomPadding: background.bottomMargin + spacing: PlasmaCore.Units.smallSpacing + hoverEnabled: !Kirigami.Settings.tabletMode Kirigami.MnemonicData.enabled: control.enabled && control.visible diff --git a/src/declarativeimports/plasmacomponents3/private/ButtonContent.qml b/src/declarativeimports/plasmacomponents3/private/ButtonContent.qml index 8e131d404..6dc2ce085 100644 --- a/src/declarativeimports/plasmacomponents3/private/ButtonContent.qml +++ b/src/declarativeimports/plasmacomponents3/private/ButtonContent.qml @@ -20,6 +20,9 @@ GridLayout { PlasmaCore.ColorScope.inherit: true columns: parent.display == T.Button.TextBesideIcon ? 2 : 1 + + rowSpacing: parent.spacing + columnSpacing: rowSpacing PlasmaCore.IconItem { id: icon