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

workspace: Replace ClutterClone by MetaWindowContent

Browse Source
This commit is contained in:
Georges Basile Stavracas Neto 2019-10-16 18:16:12 +02:00
parent 55b57421dc
commit 5743b52ec8
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/ui/workspace.js
View File

@ -84,7 +84,7 @@ class WindowCloneLayout extends Clutter.LayoutManager {
if (child == container._windowClone) if (child == container._windowClone)
realWindow = container.realWindow; realWindow = container.realWindow;
else else
realWindow = child.source; realWindow = child.content.window_actor;
child.allocate(this._makeBoxForWindow(realWindow.meta_window), child.allocate(this._makeBoxForWindow(realWindow.meta_window),
flags); flags);
@ -110,7 +110,7 @@ var WindowClone = GObject.registerClass({
this.metaWindow._delegate = this; this.metaWindow._delegate = this;
this._workspace = workspace; this._workspace = workspace;
this._windowClone = new Clutter.Clone({ source: realWindow }); this._windowClone = new Clutter.Actor({ content: realWindow.content });
// We expect this to be used for all interaction rather than // We expect this to be used for all interaction rather than
// this._windowClone; as the former is reactive and the latter // this._windowClone; as the former is reactive and the latter
// is not, this just works for most cases. However, for DND all // is not, this just works for most cases. However, for DND all
@ -197,7 +197,7 @@ var WindowClone = GObject.registerClass({
// Delete all windows, starting from the bottom-most (most-modal) one // Delete all windows, starting from the bottom-most (most-modal) one
let windows = this.get_children(); let windows = this.get_children();
for (let i = windows.length - 1; i >= 1; i--) { for (let i = windows.length - 1; i >= 1; i--) {
let realWindow = windows[i].source; let realWindow = windows[i].content.window_actor;
let metaWindow = realWindow.meta_window; let metaWindow = realWindow.meta_window;
metaWindow.delete(global.get_current_time()); metaWindow.delete(global.get_current_time());
@ -229,7 +229,7 @@ var WindowClone = GObject.registerClass({
} }
_doAddAttachedDialog(metaWin, realWin) { _doAddAttachedDialog(metaWin, realWin) {
let clone = new Clutter.Clone({ source: realWin }); let clone = new Clutter.Actor({ content: realWin.content });
clone._sizeChangedId = metaWin.connect('size-changed', clone._sizeChangedId = metaWin.connect('size-changed',
this._onMetaWindowSizeChanged.bind(this)); this._onMetaWindowSizeChanged.bind(this));
clone._posChangedId = metaWin.connect('position-changed', clone._posChangedId = metaWin.connect('position-changed',
@ -282,7 +282,7 @@ var WindowClone = GObject.registerClass({
if (child == this._windowClone) if (child == this._windowClone)
realWindow = this.realWindow; realWindow = this.realWindow;
else else
realWindow = child.source; realWindow = child.content.window_actor;
let metaWindow = realWindow.meta_window; let metaWindow = realWindow.meta_window;
rect = rect.union(metaWindow.get_frame_rect()); rect = rect.union(metaWindow.get_frame_rect());
@ -327,7 +327,7 @@ var WindowClone = GObject.registerClass({
if (child == this._windowClone) if (child == this._windowClone)
realWindow = this.realWindow; realWindow = this.realWindow;
else else
realWindow = child.source; realWindow = child.content.window_actor;
realWindow.meta_window.disconnect(child._sizeChangedId); realWindow.meta_window.disconnect(child._sizeChangedId);
realWindow.meta_window.disconnect(child._posChangedId); realWindow.meta_window.disconnect(child._posChangedId);

8
js/ui/workspaceThumbnail.js
View File

@ -53,7 +53,8 @@ var WindowClone = GObject.registerClass({
} }
}, class WindowClone extends Clutter.Actor { }, class WindowClone extends Clutter.Actor {
_init(realWindow) { _init(realWindow) {
let clone = new Clutter.Clone({ source: realWindow }); let clone = new Clutter.Actor({ content: realWindow.content,
request_mode: Clutter.RequestMode.CONTENT_SIZE });
super._init({ super._init({
layout_manager: new PrimaryActorLayout(clone), layout_manager: new PrimaryActorLayout(clone),
reactive: true reactive: true
@ -137,7 +138,8 @@ var WindowClone = GObject.registerClass({
} }
_doAddAttachedDialog(metaDialog, realDialog) { _doAddAttachedDialog(metaDialog, realDialog) {
let clone = new Clutter.Clone({ source: realDialog }); let clone = new Clutter.Actor({ content: realDialog.content,
request_mode: Clutter.RequestMode.CONTENT_SIZE });
this._updateDialogPosition(realDialog, clone); this._updateDialogPosition(realDialog, clone);
clone._updateId = realDialog.connect('notify::position', dialog => { clone._updateId = realDialog.connect('notify::position', dialog => {
@ -163,7 +165,7 @@ var WindowClone = GObject.registerClass({
_disconnectSignals() { _disconnectSignals() {
this.get_children().forEach(child => { this.get_children().forEach(child => {
let realWindow = child.source; let realWindow = child.content.window_actor;
realWindow.disconnect(child._updateId); realWindow.disconnect(child._updateId);
realWindow.disconnect(child._destroyId); realWindow.disconnect(child._destroyId);