git.iko.soy/unity8
on xenial help sign in
Merge from -refactor
5ecff48Michael Terry
qml/Tutorial/Slider.qml+2−1
compare with xenial
unifiedsplit
@@ -37,7 +37,8 @@ Item {
37 readonly property real margin: units.gu(0.5)
37 readonly property real margin: units.gu(0.5)
38 readonly property real arrowSize: root.height - margin * 2
38 readonly property real arrowSize: root.height - margin * 2
39 readonly property real dotSize: units.dp(1)
39 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)
41 }
42 }
42
43
43 implicitWidth: shortSwipe ? units.gu(15) : units.gu(27.5)
44 implicitWidth: shortSwipe ? units.gu(15) : units.gu(27.5)
qml/Tutorial/TutorialLeft.qml−1
@@ -78,7 +78,6 @@ TutorialPage {
78 id: slider
78 id: slider
79 anchors {
79 anchors {
80 left: parent.left
80 left: parent.left
81− leftMargin: -units.gu(2)
82 top: parent.top
81 top: parent.top
83 topMargin: root.textBottom + units.gu(3)
82 topMargin: root.textBottom + units.gu(3)
84 }
83 }