VesperOS/gnome-shell-extensions
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

window-list: Actorize

Browse Source 
gnome-shell is in the process of moving from composition to subclassing.
Do the same here, and use custom actor classes instead of "actor" and
"_delegate" properties.

https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/84
This commit is contained in:
Florian Müllner
2019-07-19 16:00:36 +02:00
parent 5b7631898c
commit b6a6de9bb5
2 changed files with 116 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/window-list/extension.js
+97 -93
View File
@@ -1,5 +1,5 @@
/* exported init */ /* exported init */
const { Clutter, Gio, GLib, Gtk, Meta, Shell, St } = imports.gi; const { Clutter, Gio, GLib, GObject, Gtk, Meta, Shell, St } = imports.gi;
const DND = imports.ui.dnd; const DND = imports.ui.dnd;
const ExtensionUtils = imports.misc.extensionUtils; const ExtensionUtils = imports.misc.extensionUtils;
@@ -133,19 +133,22 @@ class WindowContextMenu extends PopupMenu.PopupMenu {
} }
} }
class WindowTitle { const WindowTitle = GObject.registerClass({
constructor(metaWindow) { GTypeName: 'WindowListWindowTitle'
}, class WindowTitle extends St.BoxLayout {
_init(metaWindow) {
this._metaWindow = metaWindow; this._metaWindow = metaWindow;
this.actor = new St.BoxLayout({
super._init({
style_class: 'window-button-box', style_class: 'window-button-box',
x_expand: true, x_expand: true,
y_expand: true y_expand: true
}); });
this._icon = new St.Bin({ style_class: 'window-button-icon' }); this._icon = new St.Bin({ style_class: 'window-button-icon' });
this.actor.add(this._icon); this.add(this._icon);
this.label_actor = new St.Label({ y_align: Clutter.ActorAlign.CENTER }); this.label_actor = new St.Label({ y_align: Clutter.ActorAlign.CENTER });
this.actor.add(this.label_actor); this.add(this.label_actor);
this._textureCache = St.TextureCache.get_default(); this._textureCache = St.TextureCache.get_default();
this._iconThemeChangedId = this._textureCache.connect( this._iconThemeChangedId = this._textureCache.connect(
@@ -156,7 +159,7 @@ class WindowTitle {
'notify::gtk-application-id', this._updateIcon.bind(this)); 'notify::gtk-application-id', this._updateIcon.bind(this));
this._updateIcon(); this._updateIcon();
this.actor.connect('destroy', this._onDestroy.bind(this)); this.connect('destroy', this._onDestroy.bind(this));
this._notifyTitleId = this._metaWindow.connect( this._notifyTitleId = this._metaWindow.connect(
'notify::title', this._updateTitle.bind(this)); 'notify::title', this._updateTitle.bind(this));
@@ -198,33 +201,32 @@ class WindowTitle {
this._metaWindow.disconnect(this._notifyWmClass); this._metaWindow.disconnect(this._notifyWmClass);
this._metaWindow.disconnect(this._notifyAppId); this._metaWindow.disconnect(this._notifyAppId);
} }
} });
class BaseButton { const BaseButton = GObject.registerClass({
constructor(perMonitor, monitorIndex) { GTypeName: 'WindowListBaseButton',
if (this.constructor === BaseButton) GTypeFlags: GObject.TypeFlags.ABSTRACT
throw new TypeError('Cannot instantiate abstract class BaseButton'); }, class BaseButton extends St.Button {
_init(perMonitor, monitorIndex) {
this._perMonitor = perMonitor; this._perMonitor = perMonitor;
this._monitorIndex = monitorIndex; this._monitorIndex = monitorIndex;
this.actor = new St.Button({ super._init({
style_class: 'window-button', style_class: 'window-button',
x_fill: true, x_fill: true,
y_fill: true, y_fill: true,
can_focus: true, can_focus: true,
button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE
}); });
this.actor._delegate = this;
this.actor.connect('allocation-changed', this.connect('allocation-changed',
this._updateIconGeometry.bind(this)); this._updateIconGeometry.bind(this));
this.actor.connect('clicked', this._onClicked.bind(this)); this.connect('clicked', this._onClicked.bind(this));
this.actor.connect('destroy', this._onDestroy.bind(this)); this.connect('destroy', this._onDestroy.bind(this));
this.actor.connect('popup-menu', this._onPopupMenu.bind(this)); this.connect('popup-menu', this._onPopupMenu.bind(this));
this._contextMenuManager = new PopupMenu.PopupMenuManager(this.actor); this._contextMenuManager = new PopupMenu.PopupMenuManager(this);
this._switchWorkspaceId = global.window_manager.connect( this._switchWorkspaceId = global.window_manager.connect(
'switch-workspace', this._updateVisibility.bind(this)); 'switch-workspace', this._updateVisibility.bind(this));
@@ -240,14 +242,14 @@ class BaseButton {
} }
get active() { get active() {
return this.actor.has_style_class_name('focused'); return this.has_style_class_name('focused');
} }
activate() { activate() {
if (this.active) if (this.active)
return; return;
this._onClicked(this.actor, 1); this._onClicked(this, 1);
} }
_onClicked(_actor, _button) { _onClicked(_actor, _button) {
@@ -272,9 +274,9 @@ class BaseButton {
_updateStyle() { _updateStyle() {
if (this._isFocused()) if (this._isFocused())
this.actor.add_style_class_name('focused'); this.add_style_class_name('focused');
else else
this.actor.remove_style_class_name('focused'); this.remove_style_class_name('focused');
} }
_windowEnteredOrLeftMonitor(_metaDisplay, _monitorIndex, _metaWindow) { _windowEnteredOrLeftMonitor(_metaDisplay, _monitorIndex, _metaWindow) {
@@ -298,8 +300,8 @@ class BaseButton {
_getIconGeometry() { _getIconGeometry() {
let rect = new Meta.Rectangle(); let rect = new Meta.Rectangle();
[rect.x, rect.y] = this.actor.get_transformed_position(); [rect.x, rect.y] = this.get_transformed_position();
[rect.width, rect.height] = this.actor.get_transformed_size(); [rect.width, rect.height] = this.get_transformed_size();
return rect; return rect;
} }
@@ -320,21 +322,23 @@ class BaseButton {
global.display.disconnect(this._windowLeftMonitorId); global.display.disconnect(this._windowLeftMonitorId);
this._windowLeftMonitorId = 0; this._windowLeftMonitorId = 0;
} }
} });
class WindowButton extends BaseButton { const WindowButton = GObject.registerClass({
constructor(metaWindow, perMonitor, monitorIndex) { GTypeName: 'WindowListWindowButton'
super(perMonitor, monitorIndex); }, class WindowButton extends BaseButton {
_init(metaWindow, perMonitor, monitorIndex) {
super._init(perMonitor, monitorIndex);
this.metaWindow = metaWindow; this.metaWindow = metaWindow;
this._updateVisibility(); this._updateVisibility();
this._windowTitle = new WindowTitle(this.metaWindow); this._windowTitle = new WindowTitle(this.metaWindow);
this.actor.set_child(this._windowTitle.actor); this.set_child(this._windowTitle);
this.actor.label_actor = this._windowTitle.label_actor; this.label_actor = this._windowTitle.label_actor;
this._contextMenu = new WindowContextMenu(this.actor, this.metaWindow); this._contextMenu = new WindowContextMenu(this, this.metaWindow);
this._contextMenu.connect('open-state-changed', _onMenuStateChanged); this._contextMenu.connect('open-state-changed', _onMenuStateChanged);
this._contextMenu.actor.hide(); this._contextMenu.actor.hide();
this._contextMenuManager.addMenu(this._contextMenu); this._contextMenuManager.addMenu(this._contextMenu);
@@ -368,9 +372,9 @@ class WindowButton extends BaseButton {
super._updateStyle(); super._updateStyle();
if (this.metaWindow.minimized) if (this.metaWindow.minimized)
this.actor.add_style_class_name('minimized'); this.add_style_class_name('minimized');
else else
this.actor.remove_style_class_name('minimized'); this.remove_style_class_name('minimized');
} }
_windowEnteredOrLeftMonitor(metaDisplay, monitorIndex, metaWindow) { _windowEnteredOrLeftMonitor(metaDisplay, monitorIndex, metaWindow) {
@@ -379,7 +383,7 @@ class WindowButton extends BaseButton {
} }
_updateVisibility() { _updateVisibility() {
this.actor.visible = this._isWindowVisible(this.metaWindow); this.visible = this._isWindowVisible(this.metaWindow);
} }
_updateIconGeometry() { _updateIconGeometry() {
@@ -392,14 +396,14 @@ class WindowButton extends BaseButton {
global.display.disconnect(this._notifyFocusId); global.display.disconnect(this._notifyFocusId);
this._contextMenu.destroy(); this._contextMenu.destroy();
} }
} });
class AppContextMenu extends PopupMenu.PopupMenu { class AppContextMenu extends PopupMenu.PopupMenu {
constructor(source, appButton) { constructor(source) {
super(source, 0.5, St.Side.BOTTOM); super(source, 0.5, St.Side.BOTTOM);
this._appButton = appButton; this._appButton = source;
this._minimizeItem = new PopupMenu.PopupMenuItem(_('Minimize all')); this._minimizeItem = new PopupMenu.PopupMenuItem(_('Minimize all'));
this._minimizeItem.connect('activate', () => { this._minimizeItem.connect('activate', () => {
@@ -453,15 +457,17 @@ class AppContextMenu extends PopupMenu.PopupMenu {
} }
} }
class AppButton extends BaseButton { const AppButton = GObject.registerClass({
constructor(app, perMonitor, monitorIndex) { GTypeName: 'WindowListAppButton',
super(perMonitor, monitorIndex); }, class AppButton extends BaseButton {
_init(app, perMonitor, monitorIndex) {
super._init(perMonitor, monitorIndex);
this.app = app; this.app = app;
this._updateVisibility(); this._updateVisibility();
let stack = new St.Widget({ layout_manager: new Clutter.BinLayout() }); let stack = new St.Widget({ layout_manager: new Clutter.BinLayout() });
this.actor.set_child(stack); this.set_child(stack);
this._singleWindowTitle = new St.Bin({ this._singleWindowTitle = new St.Bin({
x_expand: true, x_expand: true,
@@ -489,15 +495,15 @@ class AppButton extends BaseButton {
this._multiWindowTitle.add(label); this._multiWindowTitle.add(label);
this._multiWindowTitle.label_actor = label; this._multiWindowTitle.label_actor = label;
this._menuManager = new PopupMenu.PopupMenuManager(this.actor); this._menuManager = new PopupMenu.PopupMenuManager(this);
this._menu = new PopupMenu.PopupMenu(this.actor, 0.5, St.Side.BOTTOM); this._menu = new PopupMenu.PopupMenu(this, 0.5, St.Side.BOTTOM);
this._menu.connect('open-state-changed', _onMenuStateChanged); this._menu.connect('open-state-changed', _onMenuStateChanged);
this._menu.actor.hide(); this._menu.actor.hide();
this._menu.connect('activate', this._onMenuActivate.bind(this)); this._menu.connect('activate', this._onMenuActivate.bind(this));
this._menuManager.addMenu(this._menu); this._menuManager.addMenu(this._menu);
Main.uiGroup.add_actor(this._menu.actor); Main.uiGroup.add_actor(this._menu.actor);
this._appContextMenu = new AppContextMenu(this.actor, this); this._appContextMenu = new AppContextMenu(this);
this._appContextMenu.connect('open-state-changed', _onMenuStateChanged); this._appContextMenu.connect('open-state-changed', _onMenuStateChanged);
this._appContextMenu.actor.hide(); this._appContextMenu.actor.hide();
Main.uiGroup.add_actor(this._appContextMenu.actor); Main.uiGroup.add_actor(this._appContextMenu.actor);
@@ -530,9 +536,9 @@ class AppButton extends BaseButton {
if (!this._perMonitor) { if (!this._perMonitor) {
// fast path: use ShellApp API to avoid iterating over all windows. // fast path: use ShellApp API to avoid iterating over all windows.
let workspace = global.workspace_manager.get_active_workspace(); let workspace = global.workspace_manager.get_active_workspace();
this.actor.visible = this.app.is_on_workspace(workspace); this.visible = this.app.is_on_workspace(workspace);
} else { } else {
this.actor.visible = this.getWindowList().length >= 1; this.visible = this.getWindowList().length >= 1;
} }
} }
@@ -560,8 +566,8 @@ class AppButton extends BaseButton {
if (!this._windowTitle) { if (!this._windowTitle) {
this.metaWindow = windows[0]; this.metaWindow = windows[0];
this._windowTitle = new WindowTitle(this.metaWindow); this._windowTitle = new WindowTitle(this.metaWindow);
this._singleWindowTitle.child = this._windowTitle.actor; this._singleWindowTitle.child = this._windowTitle;
this._windowContextMenu = new WindowContextMenu(this.actor, this.metaWindow); this._windowContextMenu = new WindowContextMenu(this, this.metaWindow);
this._windowContextMenu.connect( this._windowContextMenu.connect(
'open-state-changed', _onMenuStateChanged); 'open-state-changed', _onMenuStateChanged);
Main.uiGroup.add_actor(this._windowContextMenu.actor); Main.uiGroup.add_actor(this._windowContextMenu.actor);
@@ -570,7 +576,7 @@ class AppButton extends BaseButton {
} }
this._contextMenuManager.removeMenu(this._appContextMenu); this._contextMenuManager.removeMenu(this._appContextMenu);
this._contextMenu = this._windowContextMenu; this._contextMenu = this._windowContextMenu;
this.actor.label_actor = this._windowTitle.label_actor; this.label_actor = this._windowTitle.label_actor;
} else { } else {
if (this._windowTitle) { if (this._windowTitle) {
this.metaWindow = null; this.metaWindow = null;
@@ -581,7 +587,7 @@ class AppButton extends BaseButton {
} }
this._contextMenu = this._appContextMenu; this._contextMenu = this._appContextMenu;
this._contextMenuManager.addMenu(this._appContextMenu); this._contextMenuManager.addMenu(this._appContextMenu);
this.actor.label_actor = this._multiWindowTitle.label_actor; this.label_actor = this._multiWindowTitle.label_actor;
} }
} }
@@ -610,7 +616,7 @@ class AppButton extends BaseButton {
for (let i = 0; i < windows.length; i++) { for (let i = 0; i < windows.length; i++) {
let windowTitle = new WindowTitle(windows[i]); let windowTitle = new WindowTitle(windows[i]);
let item = new PopupMenu.PopupBaseMenuItem(); let item = new PopupMenu.PopupBaseMenuItem();
item.add_actor(windowTitle.actor); item.add_actor(windowTitle);
item._window = windows[i]; item._window = windows[i];
this._menu.addMenuItem(item); this._menu.addMenuItem(item);
} }
@@ -638,25 +644,27 @@ class AppButton extends BaseButton {
this.app.disconnect(this._windowsChangedId); this.app.disconnect(this._windowsChangedId);
this._menu.destroy(); this._menu.destroy();
} }
} });
class WindowList { const WindowList = GObject.registerClass({
constructor(perMonitor, monitor) { GTypeName: 'WindowListWindowList',
}, class WindowList extends St.Widget {
_init(perMonitor, monitor) {
this._perMonitor = perMonitor; this._perMonitor = perMonitor;
this._monitor = monitor; this._monitor = monitor;
this.actor = new St.Widget({ super._init({
name: 'panel', name: 'panel',
style_class: 'bottom-panel solid', style_class: 'bottom-panel solid',
reactive: true, reactive: true,
track_hover: true, track_hover: true,
layout_manager: new Clutter.BinLayout() layout_manager: new Clutter.BinLayout()
}); });
this.actor.connect('destroy', this._onDestroy.bind(this)); this.connect('destroy', this._onDestroy.bind(this));
let box = new St.BoxLayout({ x_expand: true, y_expand: true }); let box = new St.BoxLayout({ x_expand: true, y_expand: true });
this.actor.add_actor(box); this.add_actor(box);
let toggle = new WindowPickerToggle(); let toggle = new WindowPickerToggle();
box.add_actor(toggle); box.add_actor(toggle);
@@ -697,18 +705,18 @@ class WindowList {
this._updateWorkspaceIndicatorVisibility.bind(this)); this._updateWorkspaceIndicatorVisibility.bind(this));
this._updateWorkspaceIndicatorVisibility(); this._updateWorkspaceIndicatorVisibility();
this._menuManager = new PopupMenu.PopupMenuManager(this.actor); this._menuManager = new PopupMenu.PopupMenuManager(this);
this._menuManager.addMenu(this._workspaceIndicator.menu); this._menuManager.addMenu(this._workspaceIndicator.menu);
Main.layoutManager.addChrome(this.actor, { Main.layoutManager.addChrome(this, {
affectsStruts: true, affectsStruts: true,
trackFullscreen: true trackFullscreen: true
}); });
Main.uiGroup.set_child_above_sibling(this.actor, Main.layoutManager.panelBox); Main.uiGroup.set_child_above_sibling(this, Main.layoutManager.panelBox);
Main.ctrlAltTabManager.addGroup(this.actor, _('Window List'), 'start-here-symbolic'); Main.ctrlAltTabManager.addGroup(this, _('Window List'), 'start-here-symbolic');
this.actor.width = this._monitor.width; this.width = this._monitor.width;
this.actor.connect('notify::height', this._updatePosition.bind(this)); this.connect('notify::height', this._updatePosition.bind(this));
this._updatePosition(); this._updatePosition();
this._appSystem = Shell.AppSystem.get_default(); this._appSystem = Shell.AppSystem.get_default();
@@ -723,10 +731,10 @@ class WindowList {
keyboardBox.visible = state; keyboardBox.visible = state;
if (state) { if (state) {
Main.uiGroup.set_child_above_sibling( Main.uiGroup.set_child_above_sibling(
this.actor, keyboardBox); this, keyboardBox);
} else { } else {
Main.uiGroup.set_child_above_sibling( Main.uiGroup.set_child_above_sibling(
this.actor, Main.layoutManager.panelBox); this, Main.layoutManager.panelBox);
} }
this._updateKeyboardAnchor(); this._updateKeyboardAnchor();
}); });
@@ -742,12 +750,12 @@ class WindowList {
'switch-workspace', this._checkGrouping.bind(this)); 'switch-workspace', this._checkGrouping.bind(this));
this._overviewShowingId = Main.overview.connect('showing', () => { this._overviewShowingId = Main.overview.connect('showing', () => {
this.actor.hide(); this.hide();
this._updateKeyboardAnchor(); this._updateKeyboardAnchor();
}); });
this._overviewHidingId = Main.overview.connect('hiding', () => { this._overviewHidingId = Main.overview.connect('hiding', () => {
this.actor.visible = !Main.layoutManager.primaryMonitor.inFullscreen; this.visible = !Main.layoutManager.primaryMonitor.inFullscreen;
this._updateKeyboardAnchor(); this._updateKeyboardAnchor();
}); });
@@ -785,17 +793,16 @@ class WindowList {
return; return;
let children = this._windowList.get_children() let children = this._windowList.get_children()
.filter(c => c.visible) .filter(c => c.visible);
.map(a => a._delegate);
let active = children.findIndex(c => c.active); let active = children.findIndex(c => c.active);
let newActive = Math.max(0, Math.min(active + diff, children.length - 1)); let newActive = Math.max(0, Math.min(active + diff, children.length - 1));
children[newActive].activate(); children[newActive].activate();
} }
_updatePosition() { _updatePosition() {
this.actor.set_position( this.set_position(
this._monitor.x, this._monitor.x,
this._monitor.y + this._monitor.height - this.actor.height); this._monitor.y + this._monitor.height - this.height);
} }
_updateWorkspaceIndicatorVisibility() { _updateWorkspaceIndicatorVisibility() {
@@ -842,7 +849,7 @@ class WindowList {
_getMaxWindowListWidth() { _getMaxWindowListWidth() {
let indicatorsBox = this._workspaceIndicator.get_parent(); let indicatorsBox = this._workspaceIndicator.get_parent();
return this.actor.width - indicatorsBox.get_preferred_width(-1)[1]; return this.width - indicatorsBox.get_preferred_width(-1)[1];
} }
_groupingModeChanged() { _groupingModeChanged() {
@@ -894,7 +901,7 @@ class WindowList {
if (!Main.keyboard.actor) if (!Main.keyboard.actor)
return; return;
let translationY = Main.overview.visible ? 0 : this.actor.height; let translationY = Main.overview.visible ? 0 : this.height;
Main.keyboard.actor.translation_y = -translationY; Main.keyboard.actor.translation_y = -translationY;
} }
@@ -910,7 +917,7 @@ class WindowList {
_addApp(app) { _addApp(app) {
let button = new AppButton(app, this._perMonitor, this._monitor.index); let button = new AppButton(app, this._perMonitor, this._monitor.index);
this._windowList.layout_manager.pack(button.actor, this._windowList.layout_manager.pack(button,
true, true, true, true, true, true,
Clutter.BoxAlignment.START, Clutter.BoxAlignment.START,
Clutter.BoxAlignment.START); Clutter.BoxAlignment.START);
@@ -918,7 +925,7 @@ class WindowList {
_removeApp(app) { _removeApp(app) {
let children = this._windowList.get_children(); let children = this._windowList.get_children();
let child = children.find(c => c._delegate.app == app); let child = children.find(c => c.app == app);
if (child) if (child)
child.destroy(); child.destroy();
} }
@@ -934,11 +941,11 @@ class WindowList {
return; return;
let children = this._windowList.get_children(); let children = this._windowList.get_children();
if (children.find(c => c._delegate.metaWindow == win)) if (children.find(c => c.metaWindow == win))
return; return;
let button = new WindowButton(win, this._perMonitor, this._monitor.index); let button = new WindowButton(win, this._perMonitor, this._monitor.index);
this._windowList.layout_manager.pack(button.actor, this._windowList.layout_manager.pack(button,
true, true, true, true, true, true,
Clutter.BoxAlignment.START, Clutter.BoxAlignment.START,
Clutter.BoxAlignment.START); Clutter.BoxAlignment.START);
@@ -955,7 +962,7 @@ class WindowList {
return; // not actually removed, just moved to another workspace return; // not actually removed, just moved to another workspace
let children = this._windowList.get_children(); let children = this._windowList.get_children();
let child = children.find(c => c._delegate.metaWindow == win); let child = children.find(c => c.metaWindow == win);
if (child) if (child)
child.destroy(); child.destroy();
} }
@@ -1004,15 +1011,12 @@ class WindowList {
_onDragMotion(dragEvent) { _onDragMotion(dragEvent) {
if (Main.overview.visible || if (Main.overview.visible ||
!this.actor.contains(dragEvent.targetActor)) { !this.contains(dragEvent.targetActor)) {
this._removeActivateTimeout(); this._removeActivateTimeout();
return DND.DragMotionResult.CONTINUE; return DND.DragMotionResult.CONTINUE;
} }
let hoveredWindow = null; let hoveredWindow = dragEvent.targetActor.metaWindow;
if (dragEvent.targetActor._delegate)
hoveredWindow = dragEvent.targetActor._delegate.metaWindow;
if (!hoveredWindow || if (!hoveredWindow ||
this._dndWindow == hoveredWindow) this._dndWindow == hoveredWindow)
return DND.DragMotionResult.CONTINUE; return DND.DragMotionResult.CONTINUE;
@@ -1037,7 +1041,7 @@ class WindowList {
let [x, y] = global.get_pointer(); let [x, y] = global.get_pointer();
let pickedActor = global.stage.get_actor_at_pos(Clutter.PickMode.ALL, x, y); let pickedActor = global.stage.get_actor_at_pos(Clutter.PickMode.ALL, x, y);
if (this._dndWindow && this.actor.contains(pickedActor)) if (this._dndWindow && this.contains(pickedActor))
this._dndWindow.activate(global.get_current_time()); this._dndWindow.activate(global.get_current_time());
this._dndWindow = null; this._dndWindow = null;
this._dndTimeoutId = 0; this._dndTimeoutId = 0;
@@ -1051,7 +1055,7 @@ class WindowList {
this._workspaceIndicator.destroy(); this._workspaceIndicator.destroy();
Main.ctrlAltTabManager.removeGroup(this.actor); Main.ctrlAltTabManager.removeGroup(this);
this._appSystem.disconnect(this._appStateChangedId); this._appSystem.disconnect(this._appStateChangedId);
this._appStateChangedId = 0; this._appStateChangedId = 0;
@@ -1083,7 +1087,7 @@ class WindowList {
for (let i = 0; i < windows.length; i++) for (let i = 0; i < windows.length; i++)
windows[i].metaWindow.set_icon_geometry(null); windows[i].metaWindow.set_icon_geometry(null);
} }
} });
class Extension { class Extension {
constructor() { constructor() {
@@ -1112,7 +1116,7 @@ class Extension {
} }
_buildWindowLists() { _buildWindowLists() {
this._windowLists.forEach(list => list.actor.destroy()); this._windowLists.forEach(list => list.destroy());
this._windowLists = []; this._windowLists = [];
let showOnAllMonitors = this._settings.get_boolean('show-on-all-monitors'); let showOnAllMonitors = this._settings.get_boolean('show-on-all-monitors');
@@ -1134,19 +1138,19 @@ class Extension {
this._monitorsChangedId = 0; this._monitorsChangedId = 0;
this._windowLists.forEach(windowList => { this._windowLists.forEach(windowList => {
windowList.actor.hide(); windowList.hide();
windowList.actor.destroy(); windowList.destroy();
}); });
this._windowLists = null; this._windowLists = null;
Main.windowPicker.actor.destroy(); Main.windowPicker.destroy();
delete Main.windowPicker; delete Main.windowPicker;
Main.overview.hide = this._hideOverviewOrig; Main.overview.hide = this._hideOverviewOrig;
} }
someWindowListContains(actor) { someWindowListContains(actor) {
return this._windowLists.some(list => list.actor.contains(actor)); return this._windowLists.some(list => list.contains(actor));
} }
} }
extensions/window-list/windowPicker.js
+19 -15
View File
@@ -1,6 +1,5 @@
/* exported WindowPicker, WindowPickerToggle */ /* exported WindowPicker, WindowPickerToggle */
const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi; const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
const Signals = imports.signals;
const Layout = imports.ui.layout; const Layout = imports.ui.layout;
const Main = imports.ui.main; const Main = imports.ui.main;
@@ -51,7 +50,7 @@ let MyWorkspacesDisplay = class extends WorkspacesDisplay {
this._workspacesViews.forEach(v => { this._workspacesViews.forEach(v => {
Main.layoutManager.overviewGroup.remove_actor(v.actor); Main.layoutManager.overviewGroup.remove_actor(v.actor);
Main.windowPicker.actor.add_actor(v.actor); Main.windowPicker.add_actor(v.actor);
}); });
} }
@@ -62,27 +61,33 @@ let MyWorkspacesDisplay = class extends WorkspacesDisplay {
} }
}; };
var WindowPicker = class { var WindowPicker = GObject.registerClass({
constructor() { GTypeName: 'WindowListWindowPicker',
Signals: {
'open-state-changed': { param_types: [GObject.TYPE_BOOLEAN] },
'scroll-event': { param_types: [Clutter.Event.$gtype] }
}
}, class extends Clutter.Actor {
_init() {
this._visible = false; this._visible = false;
this._modal = false; this._modal = false;
this._overlayKeyId = 0; this._overlayKeyId = 0;
this._stageKeyPressId = 0; this._stageKeyPressId = 0;
this.actor = new Clutter.Actor(); super._init();
this.actor.connect('destroy', this._onDestroy.bind(this)); this.connect('destroy', this._onDestroy.bind(this));
global.bind_property('screen-width', global.bind_property('screen-width',
this.actor, 'width', this, 'width',
GObject.BindingFlags.SYNC_CREATE); GObject.BindingFlags.SYNC_CREATE);
global.bind_property('screen-height', global.bind_property('screen-height',
this.actor, 'height', this, 'height',
GObject.BindingFlags.SYNC_CREATE); GObject.BindingFlags.SYNC_CREATE);
this._backgroundGroup = new Meta.BackgroundGroup({ reactive: true }); this._backgroundGroup = new Meta.BackgroundGroup({ reactive: true });
this.actor.add_child(this._backgroundGroup); this.add_child(this._backgroundGroup);
this._backgroundGroup.connect('scroll-event', (a, ev) => { this._backgroundGroup.connect('scroll-event', (a, ev) => {
this.emit('scroll-event', ev); this.emit('scroll-event', ev);
@@ -93,7 +98,7 @@ var WindowPicker = class {
Main.overview.addAction = a => this._backgroundGroup.add_action(a); Main.overview.addAction = a => this._backgroundGroup.add_action(a);
this._workspacesDisplay = new MyWorkspacesDisplay(); this._workspacesDisplay = new MyWorkspacesDisplay();
this.actor.add_child(this._workspacesDisplay.actor); this.add_child(this._workspacesDisplay.actor);
Main.overview.addAction = addActionOrig; Main.overview.addAction = addActionOrig;
@@ -103,7 +108,7 @@ var WindowPicker = class {
this._updateBackgrounds.bind(this)); this._updateBackgrounds.bind(this));
this._updateBackgrounds(); this._updateBackgrounds();
Main.uiGroup.insert_child_below(this.actor, global.window_group); Main.uiGroup.insert_child_below(this, global.window_group);
if (!Main.sessionMode.hasOverview) { if (!Main.sessionMode.hasOverview) {
this._overlayKeyId = global.display.connect('overlay-key', () => { this._overlayKeyId = global.display.connect('overlay-key', () => {
@@ -194,7 +199,7 @@ var WindowPicker = class {
if (this._modal) if (this._modal)
return true; return true;
this._modal = Main.pushModal(this.actor, { this._modal = Main.pushModal(this, {
actionMode: Shell.ActionMode.OVERVIEW actionMode: Shell.ActionMode.OVERVIEW
}); });
@@ -203,7 +208,7 @@ var WindowPicker = class {
return false; return false;
} }
} else if (this._modal) { } else if (this._modal) {
Main.popModal(this.actor); Main.popModal(this);
this._modal = false; this._modal = false;
} }
return true; return true;
@@ -234,8 +239,7 @@ var WindowPicker = class {
_unshadeBackgrounds() { _unshadeBackgrounds() {
Main.overview._unshadeBackgrounds.call(this); Main.overview._unshadeBackgrounds.call(this);
} }
}; });
Signals.addSignalMethods(WindowPicker.prototype);
var WindowPickerToggle = GObject.registerClass( var WindowPickerToggle = GObject.registerClass(
class WindowPickerToggle extends St.Button { class WindowPickerToggle extends St.Button {