[gnome-shell/wip/fmuellner/fix-ctrl-alt-tab] ctrlAltTab: Fix more fallout from ES6 classes
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/fmuellner/fix-ctrl-alt-tab] ctrlAltTab: Fix more fallout from ES6 classes
- Date: Fri, 15 Feb 2019 19:27:39 +0000 (UTC)
commit bbd68626cc125e5517dd415658d146e2c290b790
Author: Florian Müllner <fmuellner gnome org>
Date: Fri Feb 15 17:15:04 2019 +0100
ctrlAltTab: Fix more fallout from ES6 classes
Since ShellGenericContainer was removed, switcher popups and lists
are StWidget subclasses rather than plain JS classes.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/411
js/ui/ctrlAltTab.js | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/js/ui/ctrlAltTab.js b/js/ui/ctrlAltTab.js
index 4415f6d7a..146f8ead9 100644
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@@ -1,6 +1,6 @@
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-const { Clutter, Meta, Shell, St } = imports.gi;
+const { Clutter, GObject, Meta, Shell, St } = imports.gi;
const Main = imports.ui.main;
const SwitcherPopup = imports.ui.switcherPopup;
@@ -129,10 +129,10 @@ var CtrlAltTabManager = class CtrlAltTabManager {
}
};
-var CtrlAltTabPopup =
+var CtrlAltTabPopup = GObject.registerClass(
class CtrlAltTabPopup extends SwitcherPopup.SwitcherPopup {
- constructor(items) {
- super(items);
+ _init(items) {
+ super._init(items);
this._switcherList = new CtrlAltTabSwitcher(this._items);
}
@@ -156,12 +156,12 @@ class CtrlAltTabPopup extends SwitcherPopup.SwitcherPopup {
super._finish(time);
Main.ctrlAltTabManager.focusGroup(this._items[this._selectedIndex], time);
}
-};
+});
-var CtrlAltTabSwitcher =
+var CtrlAltTabSwitcher = GObject.registerClass(
class CtrlAltTabSwitcher extends SwitcherPopup.SwitcherList {
- constructor(items) {
- super(true);
+ _init(items) {
+ super._init(true);
for (let i = 0; i < items.length; i++)
this._addIcon(items[i]);
@@ -183,4 +183,4 @@ class CtrlAltTabSwitcher extends SwitcherPopup.SwitcherList {
this.addItem(box, text);
}
-};
+});
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]