brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keyboard: Don't show the keyboard when enabled

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=692773
This commit is contained in:
Bastien Nocera 2013-01-31 23:40:51 +01:00
parent 4618e11406
commit 30e4dcef90
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
js/ui/keyboard.js
View File

@ -176,19 +176,9 @@ const Keyboard = new Lang.Class({
if (this._keyboard) if (this._keyboard)
this._destroyKeyboard(); this._destroyKeyboard();
if (this._enableKeyboard) { if (this._enableKeyboard)
// If we've been called because the setting actually just this._setupKeyboard();
// changed to true (as opposed to being called from else
// this._init()), then we want to pop up the keyboard.
let showKeyboard = (settings != null);
// However, caribou-gtk-module or this._onKeyFocusChanged
// will probably immediately tell us to hide it, so we
// have to fake things out so we'll ignore that request.
if (showKeyboard)
this._timestamp = global.display.get_current_time_roundtrip() + 1;
this._setupKeyboard(showKeyboard);
} else
Main.layoutManager.hideKeyboard(true); Main.layoutManager.hideKeyboard(true);
}, },
@ -204,7 +194,7 @@ const Keyboard = new Lang.Class({
this._destroySource(); this._destroySource();
}, },
_setupKeyboard: function(show) { _setupKeyboard: function() {
this.actor = new St.BoxLayout({ name: 'keyboard', vertical: true, reactive: true }); this.actor = new St.BoxLayout({ name: 'keyboard', vertical: true, reactive: true });
Main.layoutManager.keyboardBox.add_actor(this.actor); Main.layoutManager.keyboardBox.add_actor(this.actor);
Main.layoutManager.trackChrome(this.actor); Main.layoutManager.trackChrome(this.actor);
@ -227,10 +217,7 @@ const Keyboard = new Lang.Class({
this._keyboardNotifyId = this._keyboard.connect('notify::active-group', Lang.bind(this, this._onGroupChanged)); this._keyboardNotifyId = this._keyboard.connect('notify::active-group', Lang.bind(this, this._onGroupChanged));
this._focusNotifyId = global.stage.connect('notify::key-focus', Lang.bind(this, this._onKeyFocusChanged)); this._focusNotifyId = global.stage.connect('notify::key-focus', Lang.bind(this, this._onKeyFocusChanged));
if (show) this._createSource();
this.show(Main.layoutManager.focusIndex);
else
this._createSource();
}, },
_onKeyFocusChanged: function () { _onKeyFocusChanged: function () {