[gnome-shell] workspace: Abort relayouting much earlier
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] workspace: Abort relayouting much earlier
- Date: Sat, 20 Apr 2013 12:34:09 +0000 (UTC)
commit 1dac4d00c411c72729cddd490690602be2c3c3b2
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Mon Feb 25 19:42:19 2013 -0500
workspace: Abort relayouting much earlier
This means that the code for computeAllWindowSlots is a bit
cleaner, which will help in the future.
https://bugzilla.gnome.org/show_bug.cgi?id=694469
js/ui/workspace.js | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 6405050..e8604b4 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -1013,6 +1013,8 @@ const Workspace = new Lang.Class({
}
let clones = this._windows.slice();
+ if (clones.length == 0)
+ return;
clones.sort(function(a, b) {
return a.metaWindow.get_stable_sequence() - b.metaWindow.get_stable_sequence();
@@ -1500,7 +1502,6 @@ const Workspace = new Lang.Class({
},
_computeAllWindowSlots: function(windows) {
- let totalWindows = windows.length;
let node = this.actor.get_theme_node();
// Window grid spacing
@@ -1513,21 +1514,14 @@ const Workspace = new Lang.Class({
right: node.get_padding(St.Side.RIGHT),
};
- if (!totalWindows)
- return [];
-
let closeButtonHeight, captionHeight;
let leftBorder, rightBorder;
- if (this._windowOverlays.length) {
- // All of the overlays have the same chrome sizes,
- // so just pick the first one.
- let overlay = this._windowOverlays[0];
- [closeButtonHeight, captionHeight] = overlay.chromeHeights();
- [leftBorder, rightBorder] = overlay.chromeWidths();
- } else {
- [closeButtonHeight, captionHeight] = [0, 0];
- [leftBorder, rightBorder] = [0, 0];
- }
+
+ // All of the overlays have the same chrome sizes,
+ // so just pick the first one.
+ let overlay = this._windowOverlays[0];
+ [closeButtonHeight, captionHeight] = overlay.chromeHeights();
+ [leftBorder, rightBorder] = overlay.chromeWidths();
rowSpacing += captionHeight;
columnSpacing += (rightBorder + leftBorder) / 2;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]