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

use the minimumWidth gave by the Layout

Browse Source
This commit is contained in:
Marco Martin 2014-07-25 11:26:41 +02:00
parent d29b3f051d
commit dbbb8056f5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/declarativeimports/plasmacomponents/qml/styles/ButtonStyle.qml
View File

@ -39,7 +39,7 @@ QtQuickControlStyle.ButtonStyle {
spacing: units.smallSpacing
Layout.preferredHeight: Math.max(units.iconSizes.small, label.implicitHeight)
property real minimumWidth: icon.width + label.implicitWidth + style.padding.left + style.padding.right + ((icon.valid) ? style.padding.left : 0) + (arrow.visible ? arrow.width : 0)
property real minimumWidth: Layout.minimumWidth + style.padding.left + style.padding.right
onMinimumWidthChanged: {
if (control.minimumWidth !== undefined) {
style.minimumWidth = minimumWidth;
@ -73,6 +73,7 @@ QtQuickControlStyle.ButtonStyle {
PlasmaComponents.Label {
id: label
Layout.minimumWidth: Math.min(implicitWidth, theme.mSize(theme.defaultFont).width * 10)
text: control.text
font: control.font
visible: control.text != ""