450608d · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

fix home button not working while in spread mode

450608dMichael Zanetti13 years ago

qml/Shell.qml+5−1

compare with xenial

unifiedsplit

@@ -253,7 +253,10 @@ FocusScope {

253 if (locked) {

254 return;

255 }

256+ forceHide();

257+ }

256

258

259+ function forceHide() {

257 shown = false;

260 shown = false;

258 if (ApplicationManager.focusedApplicationId) {

261 if (ApplicationManager.focusedApplicationId) {

259 ApplicationManager.unfocusCurrentApplication();

262 ApplicationManager.unfocusCurrentApplication();

@@ -441,7 +444,7 @@ FocusScope {

441 var animate = !greeter.shown && !stages.shown

444 var animate = !greeter.shown && !stages.shown

442 greeter.hide()

445 greeter.hide()

443 dash.setCurrentScope("home.scope", animate, false)

446 dash.setCurrentScope("home.scope", animate, false)

444− stages.hide()

447+ stages.forceHide()

445 }

448 }

446

449

447 function hideIndicatorMenu(delay) {

450 function hideIndicatorMenu(delay) {

@@ -544,6 +547,7 @@ FocusScope {

544 if (edgeDemo.running)

547 if (edgeDemo.running)

545 return;

548 return;

546

549

550+ print("calling this")

547 showHome()

551 showHome()

548 }

552 }

549 onDash: {

553 onDash: {

qml/Stages/PhoneStage.qml+4

@@ -68,6 +68,10 @@ Item {

68 root.fullscreen = application.fullscreen

69 mainScreenshotImage.src = application.screenshot

70 }

71+ } else {

72+ spreadView.selectedIndex = -1

73+ spreadView.stage = 0;

74+ spreadView.contentX = -spreadView.shift;

71 }

75 }

72 }

76 }