on xenial help sign in
Rename setFocused
879cc16Michael Terry
Shell.qml+16−16
@@ -464,20 +464,20 @@ FocusScope {
464 property var previousMainApp: null
464 property var previousMainApp: null
465 property var previousSideApp: null
465 property var previousSideApp: null
466
466
467− function setFocused(focused) {
467+ function removeApplicationFocus() {
468− if (!focused) {
469− greeter.previousMainApp = applicationManager.mainStageFocusedApplication;
468+ greeter.previousMainApp = applicationManager.mainStageFocusedApplication;
470− greeter.previousSideApp = applicationManager.sideStageFocusedApplication;
469+ greeter.previousSideApp = applicationManager.sideStageFocusedApplication;
471− applicationManager.unfocusCurrentApplication();
470+ applicationManager.unfocusCurrentApplication();
472− } else {
471+ }
472+
473+ function restoreApplicationFocus() {
473− if (greeter.previousMainApp) {
474+ if (greeter.previousMainApp) {
474− applicationManager.focusApplication(greeter.previousMainApp);
475+ applicationManager.focusApplication(greeter.previousMainApp);
475− greeter.previousMainApp = null;
476+ greeter.previousMainApp = null;
476− }
477+ }
477− if (greeter.previousSideApp) {
478+ if (greeter.previousSideApp) {
478− applicationManager.focusApplication(greeter.previousSideApp);
479+ applicationManager.focusApplication(greeter.previousSideApp);
479− greeter.previousSideApp = null;
480+ greeter.previousSideApp = null;
480− }
481 }
481 }
482 }
482 }
483
483
@@ -491,9 +491,9 @@ FocusScope {
491 greeter.selected(0);
491 greeter.selected(0);
492 }
492 }
493 greeter.forceActiveFocus();
493 greeter.forceActiveFocus();
494− setFocused(false);
494+ removeApplicationFocus();
495 } else {
495 } else {
496− setFocused(true);
496+ restoreApplicationFocus();
497 }
497 }
498 }
498 }
499
499