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

keyboard: add an interactive argument to input source activation

Browse Source 
This is useful to differentiate between a change due to user interaction
or automatic loading.

https://bugzilla.gnome.org/show_bug.cgi?id=766826
This commit is contained in:
Cosimo Cecchi 2016-05-25 11:54:33 -07:00
parent f81887772a
commit 5c0eba7d3b
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/ui/status/keyboard.js
View File

@ -61,8 +61,8 @@ const InputSource = new Lang.Class({
this.emit('changed');
},
activate: function() {
this.emit('activate');
activate: function(interactive) {
this.emit('activate', !!interactive);
},
_getXkbId: function() {
@ -109,7 +109,7 @@ const InputSourcePopup = new Lang.Class({
_finish : function() {
this.parent();
this._items[this._selectedIndex].activate();
this._items[this._selectedIndex].activate(true);
},
});
@ -376,7 +376,7 @@ const InputSourceManager = new Lang.Class({
while (!(is = this._inputSources[nextIndex]))
nextIndex += 1;
is.activate();
is.activate(true);
return true;
},
@ -420,7 +420,7 @@ const InputSourceManager = new Lang.Class({
this._changePerWindowSource();
},
_activateInputSource: function(is) {
_activateInputSource: function(is, interactive) {
KeyboardManager.holdKeyboard();
this._keyboardManager.apply(is.xkbId);
@ -541,7 +541,7 @@ const InputSourceManager = new Lang.Class({
this._updateMruSources();
if (this._mruSources.length > 0)
this._mruSources[0].activate();
this._mruSources[0].activate(false);
// All ibus engines are preloaded here to reduce the launching time
// when users switch the input sources.
@ -650,7 +650,7 @@ const InputSourceManager = new Lang.Class({
}
if (window._currentSource)
window._currentSource.activate();
window._currentSource.activate(false);
},
_sourcesPerWindowChanged: function() {
@ -771,7 +771,10 @@ const InputSourceIndicator = new Lang.Class({
let is = this._inputSourceManager.inputSources[i];
let menuItem = new LayoutMenuItem(is.displayName, is.shortName);
menuItem.connect('activate', Lang.bind(is, is.activate));
menuItem.connect('activate', function() {
is.activate(true);
});
let indicatorLabel = new St.Label({ text: is.shortName,
visible: false });