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

warnings--

Browse Source 
BUG:335488
This commit is contained in:
Marco Martin 2014-05-29 12:14:09 +02:00
parent 9e45440ae7
commit f7adc059ee
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/declarativeimports/plasmacomponents/qml/ToolButton.qml
View File

@ -92,12 +92,12 @@ Item {
//icon + label + left margin + right margin + spacing between icon and text //icon + label + left margin + right margin + spacing between icon and text
//here it assumesleft margin = right top = bottom, why? //here it assumesleft margin = right top = bottom, why?
// because the right and bottom margins can be disabled, so they would return 0, but their actual size is still needed for size hints // because the right and bottom margins can be disabled, so they would return 0, but their actual size is still needed for size hints
property real minimumWidth: Math.max(units.iconSizes.small, height) + label.implicitWidth + delegate.margins.left + delegate.margins.left + ((icon.valid) ? delegate.margins.left : 0) property real minimumWidth: Math.max(units.iconSizes.small, height) + label.implicitWidth + (delegate.margins ? (delegate.margins.left + delegate.margins.left + ((icon.valid) ? delegate.margins.left : 0)) : 0)
/** /**
* The smallest height this button can be to show all the contents * The smallest height this button can be to show all the contents
*/ */
property real minimumHeight: Math.max(units.iconSizes.small, label.implicitHeight) + delegate.margins.top + delegate.margins.top property real minimumHeight: Math.max(units.iconSizes.small, label.implicitHeight) + (delegate.margins ? (delegate.margins.top + delegate.margins.top) : 0)
LayoutMirroring.enabled: (Qt.application.layoutDirection === Qt.RightToLeft) LayoutMirroring.enabled: (Qt.application.layoutDirection === Qt.RightToLeft)
LayoutMirroring.childrenInherit: true LayoutMirroring.childrenInherit: true
@ -349,13 +349,13 @@ Item {
Row { Row {
anchors { anchors {
fill: parent fill: parent
leftMargin: delegate.margins.left leftMargin: delegate.margins ? delegate.margins.left : 0
topMargin: delegate.margins.top topMargin: delegate.margins ? delegate.margins.top : 0
rightMargin: delegate.margins.right rightMargin: delegate.margins ? delegate.margins.right : 0
bottomMargin: delegate.margins.bottom bottomMargin: delegate.margins ? delegate.margins.bottom : 0
} }
spacing: icon.valid ? delegate.margins.left : 0 spacing: icon.valid && delegate.margins ? delegate.margins.left : 0
PlasmaCore.IconItem { PlasmaCore.IconItem {
id: icon id: icon