[gnome-shell/wip/carlosg/osk-gesture-feedback: 3/8] keyboard: Drop layoutManager's keyboard-visible-changed
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/carlosg/osk-gesture-feedback: 3/8] keyboard: Drop layoutManager's keyboard-visible-changed
- Date: Fri, 12 Feb 2021 00:19:10 +0000 (UTC)
commit fbfcafa5da78f6ea7d27b06931a7d616391d9777
Author: Carlos Garnacho <carlosg gnome org>
Date: Thu Feb 11 14:10:48 2021 +0100
keyboard: Drop layoutManager's keyboard-visible-changed
Since now the signal is emitted and handled all within keyboard.js,
use an internal signal to manage keyboard visibility and gesture
enablement.
js/ui/keyboard.js | 21 ++++++++++++++-------
js/ui/layout.js | 13 +++++++------
2 files changed, 21 insertions(+), 13 deletions(-)
---
diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index c2a3142898..d3f66ee57c 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -1155,6 +1155,7 @@ var KeyboardManager = class KeyBoardManager {
bottomDragAction.set_enabled(!visible);
});
global.stage.add_action(bottomDragAction);
+ this._bottomDragAction = bottomDragAction;
this._syncEnabled();
}
@@ -1177,10 +1178,14 @@ var KeyboardManager = class KeyBoardManager {
if (enabled && !this._keyboard) {
this._keyboard = new Keyboard();
+ this._keyboard.connect('visibility-changed', () => {
+ this._bottomDragAction.enabled = !this._keyboard.visible;
+ });
} else if (!enabled && this._keyboard) {
this._keyboard.setCursorLocation(null);
this._keyboard.destroy();
this._keyboard = null;
+ this._bottomDragAction.enabled = true;
}
}
@@ -1222,8 +1227,11 @@ var KeyboardManager = class KeyBoardManager {
}
};
-var Keyboard = GObject.registerClass(
-class Keyboard extends St.BoxLayout {
+var Keyboard = GObject.registerClass({
+ Signals: {
+ 'visibility-changed': {},
+ },
+}, class Keyboard extends St.BoxLayout {
_init() {
super._init({ name: 'keyboard', vertical: true });
this._focusInExtendedKeys = false;
@@ -1260,9 +1268,6 @@ class Keyboard extends St.BoxLayout {
this._showIdleId = 0;
this._keyboardVisible = false;
- this._connectSignal(Main.layoutManager, 'keyboard-visible-changed', (_lm, visible) => {
- this._keyboardVisible = visible;
- });
this._keyboardRequested = false;
this._keyboardRestingId = 0;
@@ -1802,7 +1807,8 @@ class Keyboard extends St.BoxLayout {
this._animateShowComplete();
},
});
- Main.layoutManager.emit('keyboard-visible-changed', true);
+ this._keyboardVisible = true;
+ this.emit('visibility-changed');
}
_animateShowComplete() {
@@ -1830,7 +1836,8 @@ class Keyboard extends St.BoxLayout {
},
});
- Main.layoutManager.emit('keyboard-visible-changed', false);
+ this._keyboardVisible = false;
+ this.emit('visibility-changed');
}
_animateHideComplete() {
diff --git a/js/ui/layout.js b/js/ui/layout.js
index 0c844bc49a..8104ea89ef 100644
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -181,12 +181,13 @@ const defaultParams = {
};
var LayoutManager = GObject.registerClass({
- Signals: { 'hot-corners-changed': {},
- 'startup-complete': {},
- 'startup-prepared': {},
- 'monitors-changed': {},
- 'system-modal-opened': {},
- 'keyboard-visible-changed': { param_types: [GObject.TYPE_BOOLEAN] } },
+ Signals: {
+ 'hot-corners-changed': {},
+ 'startup-complete': {},
+ 'startup-prepared': {},
+ 'monitors-changed': {},
+ 'system-modal-opened': {},
+ },
}, class LayoutManager extends GObject.Object {
_init() {
super._init();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]