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

keyboard: Refactor code resetting IM on window drags

Browse Source 
When a window is dragged, the OSK should get hidden. Just
do this in a nicer way.
This commit is contained in:
Carlos Garnacho 2018-08-03 16:01:48 +02:00
parent 81956e9b84
commit 6b610b26f8
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/ui/keyboard.js
View File

@ -492,13 +492,18 @@ var FocusTracker = new Lang.Class({
_init() { _init() {
this._currentWindow = null; this._currentWindow = null;
this._currentWindowPositionId = 0;
global.display.connect('notify::focus-window', () => { global.display.connect('notify::focus-window', () => {
this._setCurrentWindow(global.display.focus_window); this._setCurrentWindow(global.display.focus_window);
this.emit('window-changed', this._currentWindow); this.emit('window-changed', this._currentWindow);
}); });
global.display.connect('grab-op-begin', (display, window, op) => {
if (window == this._currentWindow &&
(op == Meta.GrabOp.MOVING || op == Meta.GrabOp.KEYBOARD_MOVING))
this.emit('reset');
});
/* Valid for wayland clients */ /* Valid for wayland clients */
Main.inputMethod.connect('cursor-location-changed', (o, rect) => { Main.inputMethod.connect('cursor-location-changed', (o, rect) => {
let newRect = { x: rect.get_x(), y: rect.get_y(), width: rect.get_width(), height: rect.get_height() }; let newRect = { x: rect.get_x(), y: rect.get_y(), width: rect.get_width(), height: rect.get_height() };
@ -520,16 +525,7 @@ var FocusTracker = new Lang.Class({
}, },
_setCurrentWindow(window) { _setCurrentWindow(window) {
if (this._currentWindow)
this._currentWindow.disconnect(this._currentWindowPositionId);
this._currentWindow = window; this._currentWindow = window;
if (window) {
this._currentWindowPositionId = this._currentWindow.connect('position-changed', () => {
if (global.display.get_grab_op() != Meta.GrabOp.NONE)
this.emit('reset');
});
}
}, },
_setCurrentRect(rect) { _setCurrentRect(rect) {