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

don't corrupt the active part

Browse Source 
simplify the size hints
reviewed-by: kbroulik
This commit is contained in:
Marco Martin 2018-09-06 14:51:07 +02:00
parent a3e96eb17a
commit 3c48aec7ac
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/declarativeimports/plasmacomponents3/Slider.qml
View File

@ -25,14 +25,10 @@ import "private" as Private
T.Slider { T.Slider {
id: control id: control
implicitWidth: Math.max(background ? background.implicitWidth : 0, implicitWidth: control.orientation === Qt.Horizontal ? units.gridUnit * 12 : units.gridUnit * 1.6
Math.max(handle ? handle.implicitWidth : 0, implicitHeight: control.orientation === Qt.Horizontal ? units.gridUnit * 1.6 : units.gridUnit * 12
handle ? handle.implicitWidth : 0) + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
Math.max(handle ? handle.implicitHeight : 0,
handle ? handle.implicitHeight : 0) + topPadding + bottomPadding)
padding: units.gridUnit
snapMode: T.Slider.SnapOnRelease snapMode: T.Slider.SnapOnRelease
PlasmaCore.Svg { PlasmaCore.Svg {
@ -81,8 +77,8 @@ T.Slider {
prefix: "groove-highlight" prefix: "groove-highlight"
x: parent.horizontal ? 0 : (parent.width - width) / 2 x: parent.horizontal ? 0 : (parent.width - width) / 2
y: parent.horizontal ? (parent.height - height) / 2 : control.visualPosition * parent.height y: parent.horizontal ? (parent.height - height) / 2 : control.visualPosition * parent.height
width: parent.horizontal ? control.position * parent.width : parent.width width: Math.max(margins.left + margins.right, parent.horizontal ? control.position * parent.width : parent.width)
height: parent.horizontal ? parent.height : control.position * parent.height height: Math.max(margins.top + margins.bottom, parent.horizontal ? parent.height : control.position * parent.height)
} }
Repeater { Repeater {