Merge from -refactor
commit5ecff486660c4dc8fd518df192e7f9eb09f86006
authorMichael Terry <michael.terry@canonical.com>
dateWed 7 Jan 2015, 17:33 (12 years ago)
parentf6d4b0a5dc62b4
qml/Tutorial/Slider.qml+2−1
@@ -37,7 +37,8 @@ Item {
3737 readonly property real margin: units.gu(0.5)
3838 readonly property real arrowSize: root.height - margin * 2
3939 readonly property real dotSize: units.dp(1)
40− readonly property real slideOffset: MathUtils.clamp(root.offset, 0, target.x)
40+ readonly property real slideOffset: MathUtils.clamp(root.offset - offscreenOffset, -offscreenOffset, target.x)
41+ readonly property real offscreenOffset: units.gu(2)
4142 }
4243
4344 implicitWidth: shortSwipe ? units.gu(15) : units.gu(27.5)
qml/Tutorial/TutorialLeft.qml−1
@@ -78,7 +78,6 @@ TutorialPage {
7878 id: slider
7979 anchors {
8080 left: parent.left
81− leftMargin: -units.gu(2)
8281 top: parent.top
8382 topMargin: root.textBottom + units.gu(3)
8483 }