main: don't hook up overview keybinding until after startup

Toggling the overview during the startup animation reportedly
causes stuck grab and other odd behavior.

There's no reason to handle toggling the overview during this
time anyway.

This commit defers that handling until after startup.

https://bugzilla.gnome.org/show_bug.cgi?id=694837
This commit is contained in:
Ray Strode 2013-03-04 08:07:14 -05:00
parent 3368e49aa7
commit cd37e2908f
2 changed files with 8 additions and 1 deletions

View File

@ -639,6 +639,8 @@ const LayoutManager = new Lang.Class({
this.emit('panel-box-changed'); this.emit('panel-box-changed');
this._queueUpdateRegions(); this._queueUpdateRegions();
this.emit('startup-complete');
}, },
showKeyboard: function () { showKeyboard: function () {

View File

@ -58,7 +58,7 @@ let shellDBusService = null;
let shellMountOpDBusService = null; let shellMountOpDBusService = null;
let screenSaverDBus = null; let screenSaverDBus = null;
let modalCount = 0; let modalCount = 0;
let keybindingMode = Shell.KeyBindingMode.NORMAL; let keybindingMode = Shell.KeyBindingMode.NONE;
let modalActorFocusStack = []; let modalActorFocusStack = [];
let uiGroup = null; let uiGroup = null;
let magnifier = null; let magnifier = null;
@ -202,6 +202,11 @@ function startSession() {
layoutManager.connect('startup-prepared', function() { layoutManager.connect('startup-prepared', function() {
layoutManager.startupAnimation(); layoutManager.startupAnimation();
}); });
layoutManager.connect('startup-complete', function() {
if (keybindingMode == Shell.KeyBindingMode.NONE) {
keybindingMode = Shell.KeyBindingMode.NORMAL;
}
});
} }
let _workspaces = []; let _workspaces = [];