cleanup: Port non-GObject classes to JS6 classes
ES6 finally adds standard class syntax to the language, so we can replace our custom Lang.Class framework with the new syntax. Any classes that inherit from GObject will need special treatment, so limit the port to regular javascript classes for now. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/361
This commit is contained in:
Florian Müllner
committed by
Georges Basile Stavracas Neto
Georges Basile Stavracas Neto
parent
99ce3deeb0
commit
bacfdbbb03
@ -102,10 +102,8 @@ var WindowCloneLayout = new Lang.Class({
|
||||
}
|
||||
});
|
||||
|
||||
var WindowClone = new Lang.Class({
|
||||
Name: 'WindowClone',
|
||||
|
||||
_init(realWindow, workspace) {
|
||||
var WindowClone = class {
|
||||
constructor(realWindow, workspace) {
|
||||
this.realWindow = realWindow;
|
||||
this.metaWindow = realWindow.meta_window;
|
||||
this.metaWindow._delegate = this;
|
||||
@ -180,18 +178,18 @@ var WindowClone = new Lang.Class({
|
||||
|
||||
this._selected = false;
|
||||
this._closeRequested = false;
|
||||
},
|
||||
}
|
||||
|
||||
set slot(slot) {
|
||||
this._slot = slot;
|
||||
},
|
||||
}
|
||||
|
||||
get slot() {
|
||||
if (this.inDrag)
|
||||
return this._dragSlot;
|
||||
else
|
||||
return this._slot;
|
||||
},
|
||||
}
|
||||
|
||||
deleteAll() {
|
||||
// Delete all windows, starting from the bottom-most (most-modal) one
|
||||
@ -205,7 +203,7 @@ var WindowClone = new Lang.Class({
|
||||
|
||||
this.metaWindow.delete(global.get_current_time());
|
||||
this._closeRequested = true;
|
||||
},
|
||||
}
|
||||
|
||||
addDialog(win) {
|
||||
let parent = win.get_transient_for();
|
||||
@ -222,11 +220,11 @@ var WindowClone = new Lang.Class({
|
||||
// assume it's a close confirmation and leave the overview
|
||||
if (this._closeRequested)
|
||||
this._activate();
|
||||
},
|
||||
}
|
||||
|
||||
hasAttachedDialogs() {
|
||||
return this.actor.get_n_children() > 1;
|
||||
},
|
||||
}
|
||||
|
||||
_doAddAttachedDialog(metaWin, realWin) {
|
||||
let clone = new Clutter.Clone({ source: realWin });
|
||||
@ -240,7 +238,7 @@ var WindowClone = new Lang.Class({
|
||||
this._onMetaWindowSizeChanged();
|
||||
});
|
||||
this.actor.add_child(clone);
|
||||
},
|
||||
}
|
||||
|
||||
_updateAttachedDialogs() {
|
||||
let iter = win => {
|
||||
@ -256,23 +254,23 @@ var WindowClone = new Lang.Class({
|
||||
return true;
|
||||
};
|
||||
this.metaWindow.foreach_transient(iter);
|
||||
},
|
||||
}
|
||||
|
||||
get boundingBox() {
|
||||
return this._boundingBox;
|
||||
},
|
||||
}
|
||||
|
||||
get width() {
|
||||
return this._boundingBox.width;
|
||||
},
|
||||
}
|
||||
|
||||
get height() {
|
||||
return this._boundingBox.height;
|
||||
},
|
||||
}
|
||||
|
||||
getOriginalPosition() {
|
||||
return [this._boundingBox.x, this._boundingBox.y];
|
||||
},
|
||||
}
|
||||
|
||||
_computeBoundingBox() {
|
||||
let rect = this.metaWindow.get_frame_rect();
|
||||
@ -291,7 +289,7 @@ var WindowClone = new Lang.Class({
|
||||
// Convert from a MetaRectangle to a native JS object
|
||||
this._boundingBox = { x: rect.x, y: rect.y, width: rect.width, height: rect.height };
|
||||
this.actor.layout_manager.boundingBox = rect;
|
||||
},
|
||||
}
|
||||
|
||||
// Find the actor just below us, respecting reparenting done
|
||||
// by DND code
|
||||
@ -307,7 +305,7 @@ var WindowClone = new Lang.Class({
|
||||
} else {
|
||||
return this._stackAbove;
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
setStackAbove(actor) {
|
||||
this._stackAbove = actor;
|
||||
@ -320,11 +318,11 @@ var WindowClone = new Lang.Class({
|
||||
this.actor.lower_bottom();
|
||||
else
|
||||
this.actor.raise(actualAbove);
|
||||
},
|
||||
}
|
||||
|
||||
destroy() {
|
||||
this.actor.destroy();
|
||||
},
|
||||
}
|
||||
|
||||
_disconnectSignals() {
|
||||
this.actor.get_children().forEach(child => {
|
||||
@ -338,12 +336,12 @@ var WindowClone = new Lang.Class({
|
||||
realWindow.meta_window.disconnect(child._posChangedId);
|
||||
realWindow.disconnect(child._destroyId);
|
||||
});
|
||||
},
|
||||
}
|
||||
|
||||
_onMetaWindowSizeChanged() {
|
||||
this._computeBoundingBox();
|
||||
this.emit('size-changed');
|
||||
},
|
||||
}
|
||||
|
||||
_onDestroy() {
|
||||
this._disconnectSignals();
|
||||
@ -357,12 +355,12 @@ var WindowClone = new Lang.Class({
|
||||
}
|
||||
|
||||
this.disconnectAll();
|
||||
},
|
||||
}
|
||||
|
||||
_activate() {
|
||||
this._selected = true;
|
||||
this.emit('selected', global.get_current_time());
|
||||
},
|
||||
}
|
||||
|
||||
_onKeyPress(actor, event) {
|
||||
let symbol = event.get_key_symbol();
|
||||
@ -373,11 +371,11 @@ var WindowClone = new Lang.Class({
|
||||
}
|
||||
|
||||
return false;
|
||||
},
|
||||
}
|
||||
|
||||
_onClicked(action, actor) {
|
||||
this._activate();
|
||||
},
|
||||
}
|
||||
|
||||
_onLongPress(action, actor, state) {
|
||||
// Take advantage of the Clutter policy to consider
|
||||
@ -400,7 +398,7 @@ var WindowClone = new Lang.Class({
|
||||
this.emit('show-chrome');
|
||||
}
|
||||
return true;
|
||||
},
|
||||
}
|
||||
|
||||
_onDragBegin(draggable, time) {
|
||||
this._dragSlot = this._slot;
|
||||
@ -408,19 +406,19 @@ var WindowClone = new Lang.Class({
|
||||
this.dragOrigScale = this.actor.scale_x;
|
||||
this.inDrag = true;
|
||||
this.emit('drag-begin');
|
||||
},
|
||||
}
|
||||
|
||||
handleDragOver(source, actor, x, y, time) {
|
||||
return this._workspace.handleDragOver(source, actor, x, y, time);
|
||||
},
|
||||
}
|
||||
|
||||
acceptDrop(source, actor, x, y, time) {
|
||||
this._workspace.acceptDrop(source, actor, x, y, time);
|
||||
},
|
||||
}
|
||||
|
||||
_onDragCancelled(draggable, time) {
|
||||
this.emit('drag-cancelled');
|
||||
},
|
||||
}
|
||||
|
||||
_onDragEnd(draggable, time, snapback) {
|
||||
this.inDrag = false;
|
||||
@ -438,7 +436,7 @@ var WindowClone = new Lang.Class({
|
||||
|
||||
this.emit('drag-end');
|
||||
}
|
||||
});
|
||||
};
|
||||
Signals.addSignalMethods(WindowClone.prototype);
|
||||
|
||||
|
||||
@ -447,10 +445,8 @@ Signals.addSignalMethods(WindowClone.prototype);
|
||||
* @parentActor: The actor which will be the parent of all overlay items
|
||||
* such as app icon and window caption
|
||||
*/
|
||||
var WindowOverlay = new Lang.Class({
|
||||
Name: 'WindowOverlay',
|
||||
|
||||
_init(windowClone, parentActor) {
|
||||
var WindowOverlay = class {
|
||||
constructor(windowClone, parentActor) {
|
||||
let metaWindow = windowClone.metaWindow;
|
||||
|
||||
this._windowClone = windowClone;
|
||||
@ -505,37 +501,37 @@ var WindowOverlay = new Lang.Class({
|
||||
// the signal will be emitted normally when we are added
|
||||
if (parentActor.get_stage())
|
||||
this._onStyleChanged();
|
||||
},
|
||||
}
|
||||
|
||||
hide() {
|
||||
this._hidden = true;
|
||||
|
||||
this.hideCloseButton();
|
||||
},
|
||||
}
|
||||
|
||||
show() {
|
||||
this._hidden = false;
|
||||
|
||||
if (this._windowClone.actor['has-pointer'])
|
||||
this._animateVisible();
|
||||
},
|
||||
}
|
||||
|
||||
chromeHeights() {
|
||||
return [Math.max(this.borderSize, this.closeButton.height - this.closeButton._overlap),
|
||||
(this.title.height - this.borderSize) / 2];
|
||||
},
|
||||
}
|
||||
|
||||
chromeWidths() {
|
||||
return [this.borderSize,
|
||||
Math.max(this.borderSize, this.closeButton.width - this.closeButton._overlap)];
|
||||
},
|
||||
}
|
||||
|
||||
setMaxChromeWidth(max) {
|
||||
if (this._maxTitleWidth == max)
|
||||
return;
|
||||
|
||||
this._maxTitleWidth = max;
|
||||
},
|
||||
}
|
||||
|
||||
relayout(animate) {
|
||||
let button = this.closeButton;
|
||||
@ -598,7 +594,7 @@ var WindowOverlay = new Lang.Class({
|
||||
this.border.set_position(borderX, borderY);
|
||||
this.border.set_size(borderWidth, borderHeight);
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
_getCaption() {
|
||||
let metaWindow = this._windowClone.metaWindow;
|
||||
@ -608,7 +604,7 @@ var WindowOverlay = new Lang.Class({
|
||||
let tracker = Shell.WindowTracker.get_default();
|
||||
let app = tracker.get_window_app(metaWindow);
|
||||
return app.get_name();
|
||||
},
|
||||
}
|
||||
|
||||
_animateOverlayActor(actor, x, y, width, height) {
|
||||
let params = { x: x,
|
||||
@ -621,12 +617,12 @@ var WindowOverlay = new Lang.Class({
|
||||
params.height = height;
|
||||
|
||||
Tweener.addTween(actor, params);
|
||||
},
|
||||
}
|
||||
|
||||
_windowCanClose() {
|
||||
return this._windowClone.metaWindow.can_close() &&
|
||||
!this._windowClone.hasAttachedDialogs();
|
||||
},
|
||||
}
|
||||
|
||||
_onDestroy() {
|
||||
if (this._idleToggleCloseId > 0) {
|
||||
@ -637,7 +633,7 @@ var WindowOverlay = new Lang.Class({
|
||||
this.title.destroy();
|
||||
this.closeButton.destroy();
|
||||
this.border.destroy();
|
||||
},
|
||||
}
|
||||
|
||||
_animateVisible() {
|
||||
this._parentActor.raise_top();
|
||||
@ -654,7 +650,7 @@ var WindowOverlay = new Lang.Class({
|
||||
time: CLOSE_BUTTON_FADE_TIME,
|
||||
transition: 'easeOutQuad' });
|
||||
});
|
||||
},
|
||||
}
|
||||
|
||||
_animateInvisible() {
|
||||
[this.closeButton, this.border, this.title].forEach(a => {
|
||||
@ -664,7 +660,7 @@ var WindowOverlay = new Lang.Class({
|
||||
time: CLOSE_BUTTON_FADE_TIME,
|
||||
transition: 'easeInQuad' });
|
||||
});
|
||||
},
|
||||
}
|
||||
|
||||
_onShowChrome() {
|
||||
// We might get enter events on the clone while the overlay is
|
||||
@ -676,14 +672,14 @@ var WindowOverlay = new Lang.Class({
|
||||
|
||||
this._animateVisible();
|
||||
this.emit('show-close-button');
|
||||
},
|
||||
}
|
||||
|
||||
_onHideChrome() {
|
||||
if (this._idleToggleCloseId == 0) {
|
||||
this._idleToggleCloseId = Mainloop.timeout_add(750, this._idleToggleCloseButton.bind(this));
|
||||
GLib.Source.set_name_by_id(this._idleToggleCloseId, '[gnome-shell] this._idleToggleCloseButton');
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
_idleToggleCloseButton() {
|
||||
this._idleToggleCloseId = 0;
|
||||
@ -693,7 +689,7 @@ var WindowOverlay = new Lang.Class({
|
||||
this._animateInvisible();
|
||||
|
||||
return GLib.SOURCE_REMOVE;
|
||||
},
|
||||
}
|
||||
|
||||
hideCloseButton() {
|
||||
if (this._idleToggleCloseId > 0) {
|
||||
@ -703,7 +699,7 @@ var WindowOverlay = new Lang.Class({
|
||||
this.closeButton.hide();
|
||||
this.border.hide();
|
||||
this.title.hide();
|
||||
},
|
||||
}
|
||||
|
||||
_onStyleChanged() {
|
||||
let closeNode = this.closeButton.get_theme_node();
|
||||
@ -714,7 +710,7 @@ var WindowOverlay = new Lang.Class({
|
||||
|
||||
this._parentActor.queue_relayout();
|
||||
}
|
||||
});
|
||||
};
|
||||
Signals.addSignalMethods(WindowOverlay.prototype);
|
||||
|
||||
var WindowPositionFlags = {
|
||||
@ -797,15 +793,15 @@ var WindowPositionFlags = {
|
||||
// each window's "cell" area to be the same, but we shrink the thumbnail
|
||||
// and center it horizontally, and align it to the bottom vertically.
|
||||
|
||||
var LayoutStrategy = new Lang.Class({
|
||||
Name: 'LayoutStrategy',
|
||||
Abstract: true,
|
||||
var LayoutStrategy = class {
|
||||
constructor(monitor, rowSpacing, columnSpacing) {
|
||||
if (new.target === LayoutStrategy)
|
||||
throw new TypeError('Cannot instantiate abstract type ' + new.target.name);
|
||||
|
||||
_init(monitor, rowSpacing, columnSpacing) {
|
||||
this._monitor = monitor;
|
||||
this._rowSpacing = rowSpacing;
|
||||
this._columnSpacing = columnSpacing;
|
||||
},
|
||||
}
|
||||
|
||||
_newRow() {
|
||||
// Row properties:
|
||||
@ -823,7 +819,7 @@ var LayoutStrategy = new Lang.Class({
|
||||
width: 0, height: 0,
|
||||
fullWidth: 0, fullHeight: 0,
|
||||
windows: [] };
|
||||
},
|
||||
}
|
||||
|
||||
// Computes and returns an individual scaling factor for @window,
|
||||
// to be applied in addition to the overal layout scale.
|
||||
@ -841,7 +837,7 @@ var LayoutStrategy = new Lang.Class({
|
||||
|
||||
// Map from [0, 1] to [1.5, 1]
|
||||
return _interpolate(1.5, 1, ratio);
|
||||
},
|
||||
}
|
||||
|
||||
// Compute the size of each row, by assigning to the properties
|
||||
// row.width, row.height, row.fullWidth, row.fullHeight, and
|
||||
@ -849,7 +845,7 @@ var LayoutStrategy = new Lang.Class({
|
||||
// intended to be called by subclasses.
|
||||
_computeRowSizes(layout) {
|
||||
throw new Error('_computeRowSizes not implemented');
|
||||
},
|
||||
}
|
||||
|
||||
// Compute strategy-specific window slots for each window in
|
||||
// @windows, given the @layout. The strategy may also use @layout
|
||||
@ -862,7 +858,7 @@ var LayoutStrategy = new Lang.Class({
|
||||
// * rows - A list of rows, which should be instantiated by _newRow.
|
||||
computeLayout(windows, layout) {
|
||||
throw new Error('computeLayout not implemented');
|
||||
},
|
||||
}
|
||||
|
||||
// Given @layout, compute the overall scale and space of the layout.
|
||||
// The scale is the individual, non-fancy scale of each window, and
|
||||
@ -895,7 +891,7 @@ var LayoutStrategy = new Lang.Class({
|
||||
|
||||
layout.scale = scale;
|
||||
layout.space = space;
|
||||
},
|
||||
}
|
||||
|
||||
computeWindowSlots(layout, area) {
|
||||
this._computeRowSizes(layout);
|
||||
@ -971,12 +967,9 @@ var LayoutStrategy = new Lang.Class({
|
||||
}
|
||||
return slots;
|
||||
}
|
||||
});
|
||||
|
||||
var UnalignedLayoutStrategy = new Lang.Class({
|
||||
Name: 'UnalignedLayoutStrategy',
|
||||
Extends: LayoutStrategy,
|
||||
};
|
||||
|
||||
var UnalignedLayoutStrategy = class extends LayoutStrategy {
|
||||
_computeRowSizes(layout) {
|
||||
let { rows: rows, scale: scale } = layout;
|
||||
for (let i = 0; i < rows.length; i++) {
|
||||
@ -984,7 +977,7 @@ var UnalignedLayoutStrategy = new Lang.Class({
|
||||
row.width = row.fullWidth * scale + (row.windows.length - 1) * this._columnSpacing;
|
||||
row.height = row.fullHeight * scale;
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
_keepSameRow(row, window, width, idealRowWidth) {
|
||||
if (row.fullWidth + width <= idealRowWidth)
|
||||
@ -997,12 +990,12 @@ var UnalignedLayoutStrategy = new Lang.Class({
|
||||
return true;
|
||||
|
||||
return false;
|
||||
},
|
||||
}
|
||||
|
||||
_sortRow(row) {
|
||||
// Sort windows horizontally to minimize travel distance
|
||||
row.windows.sort((a, b) => a.realWindow.x - b.realWindow.x);
|
||||
},
|
||||
}
|
||||
|
||||
computeLayout(windows, layout) {
|
||||
let numRows = layout.numRows;
|
||||
@ -1055,7 +1048,7 @@ var UnalignedLayoutStrategy = new Lang.Class({
|
||||
layout.gridWidth = maxRow.fullWidth;
|
||||
layout.gridHeight = gridHeight;
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
function padArea(area, padding) {
|
||||
return {
|
||||
@ -1098,10 +1091,8 @@ const WorkspaceActor = new Lang.Class({
|
||||
/**
|
||||
* @metaWorkspace: a #Meta.Workspace, or null
|
||||
*/
|
||||
var Workspace = new Lang.Class({
|
||||
Name: 'Workspace',
|
||||
|
||||
_init(metaWorkspace, monitorIndex) {
|
||||
var Workspace = class {
|
||||
constructor(metaWorkspace, monitorIndex) {
|
||||
// When dragging a window, we use this slot for reserve space.
|
||||
this._reservedSlot = null;
|
||||
this._reservedSlotWindow = null;
|
||||
@ -1174,7 +1165,7 @@ var Workspace = new Lang.Class({
|
||||
if (this.actor.mapped)
|
||||
this._syncActualGeometry();
|
||||
});
|
||||
},
|
||||
}
|
||||
|
||||
setFullGeometry(geom) {
|
||||
if (rectEqual(this._fullGeometry, geom))
|
||||
@ -1184,7 +1175,7 @@ var Workspace = new Lang.Class({
|
||||
|
||||
if (this.actor.mapped)
|
||||
this._recalculateWindowPositions(WindowPositionFlags.NONE);
|
||||
},
|
||||
}
|
||||
|
||||
setActualGeometry(geom) {
|
||||
if (rectEqual(this._actualGeometry, geom))
|
||||
@ -1195,7 +1186,7 @@ var Workspace = new Lang.Class({
|
||||
|
||||
if (this.actor.mapped)
|
||||
this._syncActualGeometry();
|
||||
},
|
||||
}
|
||||
|
||||
_syncActualGeometry() {
|
||||
if (this._actualGeometryLater || !this._actualGeometryDirty)
|
||||
@ -1216,7 +1207,7 @@ var Workspace = new Lang.Class({
|
||||
|
||||
return false;
|
||||
});
|
||||
},
|
||||
}
|
||||
|
||||
_lookupIndex(metaWindow) {
|
||||
for (let i = 0; i < this._windows.length; i++) {
|
||||
@ -1225,15 +1216,15 @@ var Workspace = new Lang.Class({
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
},
|
||||
}
|
||||
|
||||
containsMetaWindow(metaWindow) {
|
||||
return this._lookupIndex(metaWindow) >= 0;
|
||||
},
|
||||
}
|
||||
|
||||
isEmpty() {
|
||||
return this._windows.length == 0;
|
||||
},
|
||||
}
|
||||
|
||||
setReservedSlot(metaWindow) {
|
||||
if (this._reservedSlotWindow == metaWindow)
|
||||
@ -1248,7 +1239,7 @@ var Workspace = new Lang.Class({
|
||||
}
|
||||
|
||||
this._recalculateWindowPositions(WindowPositionFlags.ANIMATE);
|
||||
},
|
||||
}
|
||||
|
||||
_recalculateWindowPositions(flags) {
|
||||
this._positionWindowsFlags |= flags;
|
||||
@ -1262,7 +1253,7 @@ var Workspace = new Lang.Class({
|
||||
this._positionWindowsId = 0;
|
||||
return false;
|
||||
});
|
||||
},
|
||||
}
|
||||
|
||||
_realRecalculateWindowPositions(flags) {
|
||||
if (this._repositionWindowsId > 0) {
|
||||
@ -1283,7 +1274,7 @@ var Workspace = new Lang.Class({
|
||||
|
||||
this._currentLayout = this._computeLayout(clones);
|
||||
this._updateWindowPositions(flags);
|
||||
},
|
||||
}
|
||||
|
||||
_updateWindowPositions(flags) {
|
||||
if (this._currentLayout == null) {
|
||||
@ -1378,7 +1369,7 @@ var Workspace = new Lang.Class({
|
||||
this._showWindowOverlay(clone, overlay);
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
syncStacking(stackIndices) {
|
||||
let clones = this._windows.slice();
|
||||
@ -1398,7 +1389,7 @@ var Workspace = new Lang.Class({
|
||||
clone.setStackAbove(previousClone.actor);
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
_animateClone(clone, overlay, x, y, scale) {
|
||||
Tweener.addTween(clone.actor,
|
||||
@ -1414,7 +1405,7 @@ var Workspace = new Lang.Class({
|
||||
});
|
||||
|
||||
clone.overlay.relayout(true);
|
||||
},
|
||||
}
|
||||
|
||||
_showWindowOverlay(clone, overlay) {
|
||||
if (clone.inDrag)
|
||||
@ -1422,7 +1413,7 @@ var Workspace = new Lang.Class({
|
||||
|
||||
if (overlay && overlay._hidden)
|
||||
overlay.show();
|
||||
},
|
||||
}
|
||||
|
||||
_delayedWindowRepositioning() {
|
||||
let [x, y, mask] = global.get_pointer();
|
||||
@ -1447,7 +1438,7 @@ var Workspace = new Lang.Class({
|
||||
this._recalculateWindowPositions(WindowPositionFlags.ANIMATE);
|
||||
this._repositionWindowsId = 0;
|
||||
return GLib.SOURCE_REMOVE;
|
||||
},
|
||||
}
|
||||
|
||||
_doRemoveWindow(metaWin) {
|
||||
let win = metaWin.get_compositor_private();
|
||||
@ -1493,7 +1484,7 @@ var Workspace = new Lang.Class({
|
||||
this._repositionWindowsId = Mainloop.timeout_add(750,
|
||||
this._delayedWindowRepositioning.bind(this));
|
||||
GLib.Source.set_name_by_id(this._repositionWindowsId, '[gnome-shell] this._delayedWindowRepositioning');
|
||||
},
|
||||
}
|
||||
|
||||
_doAddWindow(metaWin) {
|
||||
if (this.leavingOverview)
|
||||
@ -1556,27 +1547,27 @@ var Workspace = new Lang.Class({
|
||||
|
||||
this._currentLayout = null;
|
||||
this._recalculateWindowPositions(WindowPositionFlags.ANIMATE);
|
||||
},
|
||||
}
|
||||
|
||||
_windowAdded(metaWorkspace, metaWin) {
|
||||
this._doAddWindow(metaWin);
|
||||
},
|
||||
}
|
||||
|
||||
_windowRemoved(metaWorkspace, metaWin) {
|
||||
this._doRemoveWindow(metaWin);
|
||||
},
|
||||
}
|
||||
|
||||
_windowEnteredMonitor(metaDisplay, monitorIndex, metaWin) {
|
||||
if (monitorIndex == this.monitorIndex) {
|
||||
this._doAddWindow(metaWin);
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
_windowLeftMonitor(metaDisplay, monitorIndex, metaWin) {
|
||||
if (monitorIndex == this.monitorIndex) {
|
||||
this._doRemoveWindow(metaWin);
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
// check for maximized windows on the workspace
|
||||
hasMaximizedWindows() {
|
||||
@ -1588,7 +1579,7 @@ var Workspace = new Lang.Class({
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
},
|
||||
}
|
||||
|
||||
fadeToOverview() {
|
||||
// We don't want to reposition windows while animating in this way.
|
||||
@ -1637,7 +1628,7 @@ var Workspace = new Lang.Class({
|
||||
this._fadeWindow(i, time, 0);
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
fadeFromOverview() {
|
||||
this.leavingOverview = true;
|
||||
@ -1695,7 +1686,7 @@ var Workspace = new Lang.Class({
|
||||
this._fadeWindow(i, time, 255);
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
_fadeWindow(index, time, opacity) {
|
||||
let clone = this._windows[index];
|
||||
@ -1719,12 +1710,12 @@ var Workspace = new Lang.Class({
|
||||
// The window is hidden
|
||||
clone.actor.opacity = 0;
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
zoomToOverview() {
|
||||
// Position and scale the windows.
|
||||
this._recalculateWindowPositions(WindowPositionFlags.ANIMATE | WindowPositionFlags.INITIAL);
|
||||
},
|
||||
}
|
||||
|
||||
zoomFromOverview() {
|
||||
let workspaceManager = global.workspace_manager;
|
||||
@ -1749,7 +1740,7 @@ var Workspace = new Lang.Class({
|
||||
// Position and scale the windows.
|
||||
for (let i = 0; i < this._windows.length; i++)
|
||||
this._zoomWindowFromOverview(i);
|
||||
},
|
||||
}
|
||||
|
||||
_zoomWindowFromOverview(index) {
|
||||
let clone = this._windows[index];
|
||||
@ -1779,11 +1770,11 @@ var Workspace = new Lang.Class({
|
||||
transition: 'easeOutQuad'
|
||||
});
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
destroy() {
|
||||
this.actor.destroy();
|
||||
},
|
||||
}
|
||||
|
||||
_onDestroy(actor) {
|
||||
if (this._overviewHiddenId) {
|
||||
@ -1815,29 +1806,29 @@ var Workspace = new Lang.Class({
|
||||
}
|
||||
|
||||
this._windows = [];
|
||||
},
|
||||
}
|
||||
|
||||
// Sets this.leavingOverview flag to false.
|
||||
_doneLeavingOverview() {
|
||||
this.leavingOverview = false;
|
||||
},
|
||||
}
|
||||
|
||||
_doneShowingOverview() {
|
||||
this._animatingWindowsFade = false;
|
||||
this._recalculateWindowPositions(WindowPositionFlags.INITIAL);
|
||||
},
|
||||
}
|
||||
|
||||
// Tests if @actor belongs to this workspaces and monitor
|
||||
_isMyWindow(actor) {
|
||||
let win = actor.meta_window;
|
||||
return (this.metaWorkspace == null || win.located_on_workspace(this.metaWorkspace)) &&
|
||||
(win.get_monitor() == this.monitorIndex);
|
||||
},
|
||||
}
|
||||
|
||||
// Tests if @win should be shown in the Overview
|
||||
_isOverviewWindow(win) {
|
||||
return !win.get_meta_window().skip_taskbar;
|
||||
},
|
||||
}
|
||||
|
||||
// Create a clone of a (non-desktop) window and add it to the window list
|
||||
_addWindowClone(win, positioned) {
|
||||
@ -1884,7 +1875,7 @@ var Workspace = new Lang.Class({
|
||||
this._windowOverlays.push(overlay);
|
||||
|
||||
return [clone, overlay];
|
||||
},
|
||||
}
|
||||
|
||||
_removeWindowClone(metaWin) {
|
||||
// find the position of the window in our list
|
||||
@ -1895,7 +1886,7 @@ var Workspace = new Lang.Class({
|
||||
|
||||
this._windowOverlays.splice(index, 1);
|
||||
return this._windows.splice(index, 1).pop();
|
||||
},
|
||||
}
|
||||
|
||||
_onShowOverlayClose(windowOverlay) {
|
||||
for (let i = 0; i < this._windowOverlays.length; i++) {
|
||||
@ -1904,7 +1895,7 @@ var Workspace = new Lang.Class({
|
||||
continue;
|
||||
overlay.hideCloseButton();
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
_isBetterLayout(oldLayout, newLayout) {
|
||||
if (oldLayout.scale === undefined)
|
||||
@ -1926,7 +1917,7 @@ var Workspace = new Lang.Class({
|
||||
// Lose -- worse scale and space
|
||||
return false;
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
_getBestLayout(windows, area, rowSpacing, columnSpacing) {
|
||||
// We look for the largest scale that allows us to fit the
|
||||
@ -1956,7 +1947,7 @@ var Workspace = new Lang.Class({
|
||||
}
|
||||
|
||||
return lastLayout;
|
||||
},
|
||||
}
|
||||
|
||||
_getSpacingAndPadding() {
|
||||
let node = this.actor.get_theme_node();
|
||||
@ -1985,20 +1976,20 @@ var Workspace = new Lang.Class({
|
||||
padding.right += rightBorder;
|
||||
|
||||
return [rowSpacing, columnSpacing, padding];
|
||||
},
|
||||
}
|
||||
|
||||
_computeLayout(windows) {
|
||||
let [rowSpacing, columnSpacing, padding] = this._getSpacingAndPadding();
|
||||
let area = padArea(this._fullGeometry, padding);
|
||||
return this._getBestLayout(windows, area, rowSpacing, columnSpacing);
|
||||
},
|
||||
}
|
||||
|
||||
_onCloneSelected(clone, time) {
|
||||
let wsIndex = undefined;
|
||||
if (this.metaWorkspace)
|
||||
wsIndex = this.metaWorkspace.index();
|
||||
Main.activateWindow(clone.metaWindow, time, wsIndex);
|
||||
},
|
||||
}
|
||||
|
||||
// Draggable target interface
|
||||
handleDragOver(source, actor, x, y, time) {
|
||||
@ -2008,7 +1999,7 @@ var Workspace = new Lang.Class({
|
||||
return DND.DragMotionResult.COPY_DROP;
|
||||
|
||||
return DND.DragMotionResult.CONTINUE;
|
||||
},
|
||||
}
|
||||
|
||||
acceptDrop(source, actor, x, y, time) {
|
||||
if (source.realWindow) {
|
||||
@ -2044,6 +2035,5 @@ var Workspace = new Lang.Class({
|
||||
|
||||
return false;
|
||||
}
|
||||
});
|
||||
|
||||
};
|
||||
Signals.addSignalMethods(Workspace.prototype);
|
||||
|
||||
Reference in New Issue
Block a user