diff --git a/js/ui/workspace.js b/js/ui/workspace.js index bb93c7261..a60b6a209 100644 --- a/js/ui/workspace.js +++ b/js/ui/workspace.js @@ -1,5 +1,6 @@ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- +const Atk = imports.gi.Atk; const Clutter = imports.gi.Clutter; const GLib = imports.gi.GLib; const GObject = imports.gi.GObject; @@ -7,10 +8,8 @@ const Mainloop = imports.mainloop; const Meta = imports.gi.Meta; const Pango = imports.gi.Pango; const Shell = imports.gi.Shell; -const St = imports.gi.St; -const Atk = imports.gi.Atk; - const Signals = imports.signals; +const St = imports.gi.St; const DND = imports.ui.dnd; const Main = imports.ui.main; @@ -292,8 +291,7 @@ var WindowClone = class { this.actor.layout_manager.boundingBox = rect; } - // Find the actor just below us, respecting reparenting done - // by DND code + // Find the actor just below us, respecting reparenting done by DND code getActualStackAbove() { if (this._stackAbove == null) return null; @@ -1137,9 +1135,8 @@ var Workspace = class { this._windows = []; this._windowOverlays = []; for (let i = 0; i < windows.length; i++) { - if (this._isOverviewWindow(windows[i])) { + if (this._isOverviewWindow(windows[i])) this._addWindowClone(windows[i], true); - } } // Track window changes @@ -1506,7 +1503,7 @@ var Workspace = class { // We might have the window in our list already if it was on all workspaces and // now was moved to this workspace - if (this._lookupIndex (metaWin) != -1) + if (this._lookupIndex(metaWin) != -1) return; if (!this._isMyWindow(win)) @@ -1538,8 +1535,9 @@ var Workspace = class { clone.slot = [x, y, clone.actor.width * scale, clone.actor.height * scale]; clone.positioned = true; - clone.actor.set_position (x, y); - clone.actor.set_scale (scale, scale); + + clone.actor.set_position(x, y); + clone.actor.set_scale(scale, scale); clone.overlay.relayout(false); } @@ -1881,7 +1879,7 @@ var Workspace = class { _removeWindowClone(metaWin) { // find the position of the window in our list - let index = this._lookupIndex (metaWin); + let index = this._lookupIndex(metaWin); if (index == -1) return null; diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js index 05167eeae..accac398b 100644 --- a/js/ui/workspaceThumbnail.js +++ b/js/ui/workspaceThumbnail.js @@ -399,7 +399,7 @@ var WorkspaceThumbnail = class { // We might have the window in our list already if it was on all workspaces and // now was moved to this workspace - if (this._lookupIndex (metaWin) != -1) + if (this._lookupIndex(metaWin) != -1) return; if (!this._isMyWindow(win)) @@ -412,7 +412,7 @@ var WorkspaceThumbnail = class { while (parent.is_attached_dialog()) parent = parent.get_transient_for(); - let idx = this._lookupIndex (parent); + let idx = this._lookupIndex(parent); if (idx < 0) { // parent was not created yet, it will take care // of the dialog when created @@ -536,7 +536,7 @@ var WorkspaceThumbnail = class { _removeWindowClone(metaWin) { // find the position of the window in our list - let index = this._lookupIndex (metaWin); + let index = this._lookupIndex(metaWin); if (index == -1) return null;