on xenial help sign in
fix + make test les strict
384c7f3Albert Astals Cid
qml/Tutorial/TutorialBottom.qml+1−1
@@ -51,7 +51,7 @@ TutorialPage {
51 readonly property real dragAreaHeight: units.gu(3) // based on PageWithBottomEdge.qml
51 readonly property real dragAreaHeight: units.gu(3) // based on PageWithBottomEdge.qml
52 readonly property real targetDistance: height * 0.2 + dragAreaHeight // based on PageWithBottomEdge.qml
52 readonly property real targetDistance: height * 0.2 + dragAreaHeight // based on PageWithBottomEdge.qml
53
53
54− opacityOverride: dragArea.dragging ? 1 - (-dragArea.distance / targetDistance) : 1
54+ opacityOverride: dragArea.dragging ? 1 - (dragArea.distance / targetDistance) : 1
55
55
56 mouseArea {
56 mouseArea {
57 anchors.bottomMargin: root.dragAreaHeight
57 anchors.bottomMargin: root.dragAreaHeight
tests/qmltests/Tutorial/tst_Tutorial.qml+1−1
@@ -469,7 +469,7 @@ Rectangle {
469 // compare opacity with a bound rather than hard 0.6 because progress doesn't
469 // compare opacity with a bound rather than hard 0.6 because progress doesn't
470 // always match the drag perfectly (takes a moment for drag to kick in)
470 // always match the drag perfectly (takes a moment for drag to kick in)
471 tryCompareFunction(function() {
471 tryCompareFunction(function() {
472− return tutorialTop.opacity >= 0.6 && tutorialTop.opacity < 0.7;
472+ return tutorialTop.opacity >= 0.5 && tutorialTop.opacity < 0.7;
473 }, true);
473 }, true);
474 touchFlick(shell, halfWidth, 0, halfWidth, shell.height * 0.4, false, true);
474 touchFlick(shell, halfWidth, 0, halfWidth, shell.height * 0.4, false, true);
475
475