alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix loop on ButtonStyle

Browse Source 
Nowadays the size of the icon is defined by the size of the button itself,
and vice-versa.
This patch uses the unit sizes to decide which sizes to offer.

REVIEW: 124628
This commit is contained in:
Aleix Pol 2015-08-05 18:30:08 +02:00
parent 4e9f3dd129
commit f87f03b4a8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/declarativeimports/plasmastyle/ButtonStyle.qml
View File

@ -38,7 +38,7 @@ QtQuickControlStyle.ButtonStyle {
label: RowLayout {
id: buttonContent
spacing: units.smallSpacing
Layout.preferredHeight: Math.max(units.iconSizes.small, label.implicitHeight)
Layout.preferredHeight: Math.max(units.iconSizes.small, label.implicitHeight, icon.implicitHeight)
property real minimumWidth: Layout.minimumWidth + style.padding.left + style.padding.right
onMinimumWidthChanged: {
@ -60,11 +60,11 @@ QtQuickControlStyle.ButtonStyle {
id: icon
source: control.iconName || control.iconSource
anchors.verticalCenter: parent.verticalCenter
Layout.minimumWidth: valid ? parent.height: 0
Layout.maximumWidth: Layout.minimumWidth
Layout.minimumWidth: valid ? units.iconSizes.tiny : 0
Layout.preferredWidth: valid ? units.iconSizes.small : 0
visible: valid
Layout.minimumHeight: Layout.minimumWidth
Layout.maximumHeight: Layout.minimumWidth
Layout.preferredHeight: Layout.preferredWidth
active: control.hovered
colorGroup: PlasmaCore.Theme.ButtonColorGroup
}