git.iko.soy/unity8
on xenial help sign in
addressed nits
commitf79fc1713a3a17118ec7eed60fb6f08e47d7f1e2 authorMichael Zanetti <michael.zanetti@canonical.com> dateFri 10 Oct 2014, 16:48 (12 years ago) parent5f2a099
3 files changed+14−5
compare with xenial
unifiedsplit
qml/Stages/PhoneStage.qml+1−1 qml/Stages/TabletStage.qml+3−1 tests/qmltests/Stages/tst_PhoneStage.qml+10−3
qml/Stages/PhoneStage.qml+1−1
@@ -257,7 +257,7 @@ Rectangle {
257257 x: spreadView.contentX
258258
259259 onClicked: {
260− spreadView.snapTo(0)
260+ spreadView.snapTo(0);
261261 }
262262
263263 Repeater {
qml/Stages/TabletStage.qml+3−1
@@ -384,7 +384,9 @@ Rectangle {
384384 height: root.height
385385 width: spreadView.width + Math.max(spreadView.width, ApplicationManager.count * spreadView.tileDistance)
386386
387− onClicked: spreadView.snapTo(0)
387+ onClicked: {
388+ spreadView.snapTo(0);
389+ }
388390
389391 Rectangle {
390392 id: sideStageBackground
tests/qmltests/Stages/tst_PhoneStage.qml+10−3
@@ -314,13 +314,20 @@ Item {
314314 }
315315
316316 function test_backgroundClickCancelsSpread() {
317− addApps(3)
317+ addApps(3);
318+
319+ var focusedAppId = ApplicationManager.focusedApplicationId;
320+
318321 goToSpread();
319322
320− mouseClick(phoneStage, units.gu(1), units.gu(1))
323+ mouseClick(phoneStage, units.gu(1), units.gu(1));
321324
325+ // Make sure the spread is in the idle position
322326 var spreadView = findChild(phoneStage, "spreadView");
323− tryCompare(spreadView, "contentX", -spreadView.shift)
327+ tryCompare(spreadView, "contentX", -spreadView.shift);
328+
329+ // Make sure the same app is still focused
330+ compare(focusedAppId, ApplicationManager.focusedApplicationId);
324331 }
325332
326333 function cleanup() {