Merge "Warning --"

This commit is contained in:
Marco Martin 2014-10-01 10:04:17 +02:00 committed by Gerrit Code Review
commit 2fcc325abf

View File

@ -59,8 +59,8 @@ QtControls.Slider {
*/
property bool inverted: false
width: contents.isVertical ? theme.mSize(theme.defaultFont).height*1.6 : 200
height: contents.isVertical ? 200 : theme.mSize(theme.defaultFont).height*1.6
width: slider.isVertical ? theme.mSize(theme.defaultFont).height*1.6 : 200
height: slider.isVertical ? 200 : theme.mSize(theme.defaultFont).height*1.6
// TODO: needs to define if there will be specific graphics for
// disabled sliders
opacity: enabled ? 1.0 : 0.5