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

use paintedWidth when significative

Browse Source 
gets updated before implicitWidth, making the center alignment work better
This commit is contained in:
Marco Martin 2012-10-12 19:36:53 +02:00
parent 86ecacf2a4
commit 6b7fa2aaac
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
declarativeimports/plasmacomponents/qml/Button.qml
View File

@ -97,7 +97,7 @@ Item {
property alias font: label.font property alias font: label.font
//icon + label + left margin + right margin + spacing between icon and text //icon + label + left margin + right margin + spacing between icon and text
property real minimumWidth: icon.width + label.implicitWidth + surfaceNormal.margins.left + surfaceNormal.margins.right + ((icon.valid) ? surfaceNormal.margins.left : 0) property real minimumWidth: icon.width + label.preferredWidth + surfaceNormal.margins.left + surfaceNormal.margins.right + ((icon.valid) ? surfaceNormal.margins.left : 0)
property real minimumHeight: Math.max(icon.height, label.paintedHeight) + surfaceNormal.margins.top + surfaceNormal.margins.bottom property real minimumHeight: Math.max(icon.height, label.paintedHeight) + surfaceNormal.margins.top + surfaceNormal.margins.bottom
signal clicked() signal clicked()
@ -239,11 +239,13 @@ Item {
id: label id: label
//FIXME: why this is needed? //FIXME: why this is needed?
onPaintedWidthChanged: { onTextChanged: {
icon.anchors.horizontalCenter = label.text.length > 0 ? undefined : icon.parent.horizontalCenter icon.anchors.horizontalCenter = label.text.length > 0 ? undefined : icon.parent.horizontalCenter
icon.anchors.left = label.text.length > 0 ? icon.parent.left : undefined icon.anchors.left = label.text.length > 0 ? icon.parent.left : undefined
} }
property int preferredWidth: button.width < button.implicitWidth ? paintedWidth: paintedWidth
anchors { anchors {
top: parent.top top: parent.top
bottom: parent.bottom bottom: parent.bottom