From 23105b27bc3d5597c04d554743eeaeaabc45914d Mon Sep 17 00:00:00 2001 From: Noah Davis Date: Mon, 17 May 2021 16:34:37 -0400 Subject: [PATCH] PC3 TabButton: Center align text without icon, use icon property --- .../plasmacomponents3/TabButton.qml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/declarativeimports/plasmacomponents3/TabButton.qml b/src/declarativeimports/plasmacomponents3/TabButton.qml index 8dd86531b..1ede48c7d 100644 --- a/src/declarativeimports/plasmacomponents3/TabButton.qml +++ b/src/declarativeimports/plasmacomponents3/TabButton.qml @@ -34,12 +34,15 @@ T.TabButton { onActivated: control.clicked() } + icon.width: PlasmaCore.Units.iconSizes.smallMedium + icon.height: PlasmaCore.Units.iconSizes.smallMedium + contentItem: GridLayout { columns: control.display == T.AbstractButton.TextBesideIcon ? 2 : 1 PlasmaCore.IconItem { id: icon - Layout.alignment: control.display != T.AbstractButton.TextBesideIcon ? Qt.AlignCenter : Qt.AlignVCenter | Qt.AlignRight + Layout.alignment: control.display != T.AbstractButton.TextBesideIcon || !label.visible ? Qt.AlignCenter : Qt.AlignVCenter | Qt.AlignRight Layout.fillWidth: true Layout.fillHeight: true @@ -50,8 +53,8 @@ T.TabButton { Layout.maximumWidth: control.icon.width > 0 ? control.icon.width : Number.POSITIVE_INFINITY Layout.maximumHeight: control.icon.height > 0 ? control.icon.height : Number.POSITIVE_INFINITY - implicitWidth: control.icon.width > 0 ? control.icon.width : PlasmaCore.Units.iconSizes.smallMedium - implicitHeight: control.icon.height > 0 ? control.icon.height : PlasmaCore.Units.iconSizes.smallMedium + implicitWidth: control.icon.width + implicitHeight: control.icon.height colorGroup: control.PlasmaCore.ColorScope.colorGroup visible: source.length > 0 && control.display !== T.AbstractButton.TextOnly @@ -63,12 +66,13 @@ T.TabButton { Layout.fillWidth: true // allow it to shrink below implicitWidth, but not exceed implicitWidth Layout.maximumWidth: Math.ceil(implicitWidth) + Layout.alignment: horizontalAlignment | verticalAlignment visible: text.length > 0 && control.display !== T.AbstractButton.IconOnly text: control.Kirigami.MnemonicData.richTextLabel font: control.font color: control.visualFocus ? PlasmaCore.ColorScope.highlightColor : PlasmaCore.ColorScope.textColor opacity: enabled || control.highlighted || control.checked ? 1 : 0.4 - horizontalAlignment: control.display != T.AbstractButton.TextBesideIcon || icon.source.length === 0 ? Text.AlignHCenter : Text.AlignLeft + horizontalAlignment: control.display != T.AbstractButton.TextBesideIcon || !icon.visible ? Text.AlignHCenter : Text.AlignLeft verticalAlignment: Text.AlignVCenter elide: Text.ElideRight }