git.iko.soy/unity8
on xenial help sign in
addressed nits
f79fc17Michael Zanetti
qml/Stages/PhoneStage.qml+1−1
compare with xenial
unifiedsplit
@@ -257,7 +257,7 @@ Rectangle {
257 x: spreadView.contentX
257 x: spreadView.contentX
258
258
259 onClicked: {
259 onClicked: {
260− spreadView.snapTo(0)
260+ spreadView.snapTo(0);
261 }
261 }
262
262
263 Repeater {
263 Repeater {
qml/Stages/TabletStage.qml+3−1
@@ -384,7 +384,9 @@ Rectangle {
384 height: root.height
384 height: root.height
385 width: spreadView.width + Math.max(spreadView.width, ApplicationManager.count * spreadView.tileDistance)
385 width: spreadView.width + Math.max(spreadView.width, ApplicationManager.count * spreadView.tileDistance)
386
386
387+ onClicked: {
387− onClicked: spreadView.snapTo(0)
388+ spreadView.snapTo(0);
389+ }
388
390
389 Rectangle {
391 Rectangle {
390 id: sideStageBackground
392 id: sideStageBackground
tests/qmltests/Stages/tst_PhoneStage.qml+10−3
@@ -314,13 +314,20 @@ Item {
314 }
314 }
315
315
316 function test_backgroundClickCancelsSpread() {
316 function test_backgroundClickCancelsSpread() {
317− addApps(3)
317+ addApps(3);
318+
319+ var focusedAppId = ApplicationManager.focusedApplicationId;
320+
318 goToSpread();
321 goToSpread();
319
322
320− mouseClick(phoneStage, units.gu(1), units.gu(1))
323+ mouseClick(phoneStage, units.gu(1), units.gu(1));
321
324
325+ // Make sure the spread is in the idle position
322 var spreadView = findChild(phoneStage, "spreadView");
326 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);
324 }
331 }
325
332
326 function cleanup() {
333 function cleanup() {