[gnome-shell/wip/workspace: 135/143] workspace: Punt the geometry-fizzling-out logic here
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/workspace: 135/143] workspace: Punt the geometry-fizzling-out logic here
- Date: Thu, 26 Sep 2013 20:21:53 +0000 (UTC)
commit b922f2b3aa0c15eaba98c26482eae34bc5f5edee
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Wed Sep 11 10:41:54 2013 -0400
workspace: Punt the geometry-fizzling-out logic here
js/ui/workspace.js | 19 +++++++++++++++++++
js/ui/workspacesView.js | 19 -------------------
2 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 52a737c..57d889c 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -906,6 +906,19 @@ function padArea(area, padding) {
};
}
+function rectEqual(one, two) {
+ if (one == two)
+ return true;
+
+ if (!one || !two)
+ return false;
+
+ return (one.x == two.x &&
+ one.y == two.y &&
+ one.width == two.width &&
+ one.height == two.height);
+}
+
/**
* @metaWorkspace: a #Meta.Workspace, or null
*/
@@ -981,11 +994,17 @@ const Workspace = new Lang.Class({
},
setFullGeometry: function(geom) {
+ if (rectEqual(this._fullGeometry, geom))
+ return;
+
this._fullGeometry = geom;
this._recalculateWindowPositions(WindowPositionFlags.NONE);
},
setActualGeometry: function(geom) {
+ if (rectEqual(this._actualGeometry, geom))
+ return;
+
this._actualGeometry = geom;
if (this._actualGeometryLater)
diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index d364de6..085d162 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -23,19 +23,6 @@ const MAX_WORKSPACES = 16;
const OVERRIDE_SCHEMA = 'org.gnome.shell.overrides';
-function rectEqual(one, two) {
- if (one == two)
- return true;
-
- if (!one || !two)
- return false;
-
- return (one.x == two.x &&
- one.y == two.y &&
- one.width == two.width &&
- one.height == two.height);
-}
-
const WorkspacesView = new Lang.Class({
Name: 'WorkspacesView',
@@ -140,9 +127,6 @@ const WorkspacesView = new Lang.Class({
},
setFullGeometry: function(geom) {
- if (rectEqual(this._fullGeometry, geom))
- return;
-
this._fullGeometry = geom;
for (let i = 0; i < this._workspaces.length; i++)
@@ -150,9 +134,6 @@ const WorkspacesView = new Lang.Class({
},
setActualGeometry: function(geom) {
- if (rectEqual(this._actualGeometry, geom))
- return;
-
this._actualGeometry = geom;
for (let i = 0; i < this._workspaces.length; i++)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]