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

use implicitWidth as label minimum width

Browse Source
This commit is contained in:
Marco Martin 2014-07-25 12:54:27 +02:00
parent dbbb8056f5
commit 05f4a44059
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,9 +57,6 @@ QtQuickControlStyle.ButtonStyle {
PlasmaCore.IconItem { PlasmaCore.IconItem {
id: icon id: icon
//control.iconSource is an url: you pass a freedesktop icon,
//and it inteprets it as an url in the local qml file filesystem path
//in order to work also with upstream controls, grossly parse the url
source: control.iconName || control.iconSource source: control.iconName || control.iconSource
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
Layout.minimumWidth: valid ? parent.height: 0 Layout.minimumWidth: valid ? parent.height: 0
@ -73,7 +70,7 @@ QtQuickControlStyle.ButtonStyle {
PlasmaComponents.Label { PlasmaComponents.Label {
id: label id: label
Layout.minimumWidth: Math.min(implicitWidth, theme.mSize(theme.defaultFont).width * 10) Layout.minimumWidth: implicitWidth
text: control.text text: control.text
font: control.font font: control.font
visible: control.text != "" visible: control.text != ""