on xenial help sign in
Rename setFocused
commit879cc165b55c8469e1198dccad200ad6dfdad74c authorMichael Terry <michael.terry@canonical.com> dateWed 9 Oct 2013, 17:21 (13 years ago) parent16c9eb3
1 file changed+16−16
Shell.qml+16−16
Shell.qml+16−16
@@ -464,20 +464,20 @@ FocusScope {
464464 property var previousMainApp: null
465465 property var previousSideApp: null
466466
467− function setFocused(focused) {
468− if (!focused) {
469− greeter.previousMainApp = applicationManager.mainStageFocusedApplication;
470− greeter.previousSideApp = applicationManager.sideStageFocusedApplication;
471− applicationManager.unfocusCurrentApplication();
472− } else {
473− if (greeter.previousMainApp) {
474− applicationManager.focusApplication(greeter.previousMainApp);
475− greeter.previousMainApp = null;
476− }
477− if (greeter.previousSideApp) {
478− applicationManager.focusApplication(greeter.previousSideApp);
479− greeter.previousSideApp = null;
480− }
467+ function removeApplicationFocus() {
468+ greeter.previousMainApp = applicationManager.mainStageFocusedApplication;
469+ greeter.previousSideApp = applicationManager.sideStageFocusedApplication;
470+ applicationManager.unfocusCurrentApplication();
471+ }
472+
473+ function restoreApplicationFocus() {
474+ if (greeter.previousMainApp) {
475+ applicationManager.focusApplication(greeter.previousMainApp);
476+ greeter.previousMainApp = null;
477+ }
478+ if (greeter.previousSideApp) {
479+ applicationManager.focusApplication(greeter.previousSideApp);
480+ greeter.previousSideApp = null;
481481 }
482482 }
483483
@@ -491,9 +491,9 @@ FocusScope {
491491 greeter.selected(0);
492492 }
493493 greeter.forceActiveFocus();
494− setFocused(false);
494+ removeApplicationFocus();
495495 } else {
496− setFocused(true);
496+ restoreApplicationFocus();
497497 }
498498 }
499499