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

less height

Browse Source
This commit is contained in:
Marco Martin 2011-11-17 20:14:47 +01:00
parent a5b16a856c
commit 3734ab5658
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,7 @@ Item {
return Math.max(theme.defaultFont.mSize.width*12, icon.width + label.paintedWidth + surfaceNormal.margins.left + surfaceNormal.margins.right) + ((icon.valid) ? surfaceNormal.margins.left : 0)
}
}
implicitHeight: Math.max(theme.defaultFont.mSize.height*1.8, Math.max(icon.height, label.paintedHeight) + surfaceNormal.margins.top + surfaceNormal.margins.bottom)
implicitHeight: Math.max(theme.defaultFont.mSize.height*1.6, Math.max(icon.height, label.paintedHeight) + surfaceNormal.margins.top/2 + surfaceNormal.margins.bottom/2)
// TODO: needs to define if there will be specific graphics for
// disabled buttons

2
declarativeimports/plasmacomponents/qml/DualStateButton.qml
View File

@ -35,7 +35,7 @@ Item {
property alias shadow: shadowLoader.sourceComponent
width: surfaceLoader.width + label.paintedWidth
height: theme.defaultFont.mSize.height*1.8
height: theme.defaultFont.mSize.height*1.6
// TODO: needs to define if there will be specific graphics for
// disabled buttons
opacity: dualButton.enabled ? 1.0 : 0.5

2
declarativeimports/plasmacomponents/qml/Label.qml
View File

@ -23,7 +23,7 @@ import org.kde.plasma.core 0.1 as PlasmaCore
Text {
id: root
height: theme.defaultFont.mSize.height*1.8
height: theme.defaultFont.mSize.height*1.6
//FIXME: wait to rely on 1.1 for lineCount > 1
verticalAlignment: paintedHeight > theme.defaultFont.mSize.height*1.5 ? Text.AlignTop : Text.AlignVCenter

4
declarativeimports/plasmacomponents/qml/Slider.qml
View File

@ -43,8 +43,8 @@ Item {
// Convenience API
property bool _isVertical: orientation == Qt.Vertical
width: _isVertical ? theme.defaultFont.mSize.height*1.8 : 200
height: _isVertical ? 200 : theme.defaultFont.mSize.height*1.8
width: _isVertical ? theme.defaultFont.mSize.height*1.6 : 200
height: _isVertical ? 200 : theme.defaultFont.mSize.height*1.6
// TODO: needs to define if there will be specific graphics for
// disabled sliders
opacity: enabled ? 1.0 : 0.5

2
declarativeimports/plasmacomponents/qml/TextField.qml
View File

@ -88,7 +88,7 @@ Item {
// TODO: fix default size
implicitWidth: theme.defaultFont.mSize.width*12
implicitHeight: theme.defaultFont.mSize.height*1.8
implicitHeight: theme.defaultFont.mSize.height*1.6
// TODO: needs to define if there will be specific graphics for
// disabled text fields
opacity: enabled ? 1.0 : 0.5

2
declarativeimports/plasmacomponents/qml/ToolButton.qml
View File

@ -48,7 +48,7 @@ Item {
return Math.max(theme.defaultFont.mSize.width*12, icon.width + label.paintedWidth + surface.margins.left + surface.margins.right) + ((icon.valid) ? surface.margins.left : 0)
}
}
implicitHeight: Math.max(theme.defaultFont.mSize.height*1.8, Math.max(icon.height, label.paintedHeight) + surface.margins.top + surface.margins.bottom)
implicitHeight: Math.max(theme.defaultFont.mSize.height*1.6, Math.max(icon.height, label.paintedHeight) + surface.margins.top/2 + surface.margins.bottom/2)
// TODO: needs to define if there will be specific graphics for
// disabled buttons