2dccdfc · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Relocate timer outside of Greeter

2dccdfcJosh Arenson12 years ago

qml/Shell.qml+10−12

compare with xenial

unifiedsplit

@@ -363,9 +363,6 @@ Item {

363 Greeter {

364 objectName: "greeter"

365

366− // Needed to expose the timer to outside objects

367− property alias showGreeterDelayed: showGreeterDelayed

368−

369 hides: [launcher, panel.indicators]

366 hides: [launcher, panel.indicators]

370 tabletMode: shell.sideStageEnabled

367 tabletMode: shell.sideStageEnabled

371 launcherOffset: launcher.progress

368 launcherOffset: launcher.progress

@@ -398,6 +395,15 @@ Item {

398 }

395 }

399 }

396 }

400

397

398+ Timer {

399+ // See powerConnection for why this is useful

400+ id: showGreeterDelayed

401+ interval: 1

402+ onTriggered: {

403+ greeter.forceShow();

404+ }

405+ }

406+

401 Connections {

407 Connections {

402 id: callConnection

408 id: callConnection

403 target: callManager

409 target: callManager

@@ -433,15 +439,7 @@ Item {

433 // make the greeter load asynchronously instead, but that

439 // make the greeter load asynchronously instead, but that

434 // introduces a whole host of timing issues, especially with

440 // introduces a whole host of timing issues, especially with

435 // its animations. So this is simpler.

441 // its animations. So this is simpler.

436− greeter.showGreeterDelayed.start();

442+ showGreeterDelayed.start();

437− }

438− }

439−

440− Timer {

441− id: showGreeterDelayed

442− interval: 1

443− onTriggered: {

444− greeter.forceShow();

445 }

443 }

446 }

444 }

447 }

445 }