[gnome-shell] WorkspacesDisplay: clean up workspacesView lists
- From: Giovanni Campagna <gcampagna src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] WorkspacesDisplay: clean up workspacesView lists
- Date: Tue, 18 Dec 2012 15:05:31 +0000 (UTC)
commit 176daa146924020320110a26565b25d51756ac62
Author: Giovanni Campagna <gcampagna src gnome org>
Date: Mon Dec 17 00:46:34 2012 +0100
WorkspacesDisplay: clean up workspacesView lists
Rather than sometimes having a list and sometimes null, keep an array
always and check for its length.
https://bugzilla.gnome.org/show_bug.cgi?id=688234
js/ui/workspacesView.js | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 2fc3fb8..260162c 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -499,7 +499,8 @@ const WorkspacesDisplay = new Lang.Class({
this._thumbnailsBox = new WorkspaceThumbnail.ThumbnailsBox();
controls.add_actor(this._thumbnailsBox.actor);
- this._workspacesViews = null;
+ this._workspacesViews = [];
+ this._workspaces = [];
this._primaryScrollAdjustment = null;
this._settings = new Gio.Settings({ schema: OVERRIDE_SCHEMA });
@@ -643,7 +644,7 @@ const WorkspacesDisplay = new Lang.Class({
for (let i = 0; i < this._workspacesViews.length; i++)
this._workspacesViews[i].destroy();
- this._workspacesViews = null;
+ this._workspacesViews = [];
for (let i = 0; i < this._workspaces.length; i++)
for (let w = 0; w < this._workspaces[i].length; w++) {
@@ -662,14 +663,12 @@ const WorkspacesDisplay = new Lang.Class({
},
_updateWorkspacesViews: function() {
- if (this._workspacesViews)
- for (let i = 0; i < this._workspacesViews.length; i++)
- this._workspacesViews[i].destroy();
+ for (let i = 0; i < this._workspacesViews.length; i++)
+ this._workspacesViews[i].destroy();
- if (this._workspaces)
- for (let i = 0; i < this._workspaces.length; i++)
- for (let w = 0; w < this._workspaces[i].length; w++)
- this._workspaces[i][w].destroy();
+ for (let i = 0; i < this._workspaces.length; i++)
+ for (let w = 0; w < this._workspaces[i].length; w++)
+ this._workspaces[i][w].destroy();
this._workspacesViews = [];
this._workspaces = [];
@@ -717,7 +716,7 @@ const WorkspacesDisplay = new Lang.Class({
},
_getPrimaryView: function() {
- if (!this._workspacesViews)
+ if (!this._workspacesViews.length)
return null;
if (this._workspacesOnlyOnPrimary)
return this._workspacesViews[0];
@@ -826,7 +825,7 @@ const WorkspacesDisplay = new Lang.Class({
},
_updateWorkspacesGeometry: function() {
- if (!this._workspacesViews)
+ if (!this._workspacesViews.length)
return;
let fullWidth = this.actor.allocation.x2 - this.actor.allocation.x1;
@@ -884,7 +883,7 @@ const WorkspacesDisplay = new Lang.Class({
this._updateAlwaysZoom();
this._updateZoom();
- if (this._workspacesViews == null)
+ if (!this._workspacesViews.length)
return;
let oldNumWorkspaces = this._workspaces[0].length;
@@ -946,7 +945,7 @@ const WorkspacesDisplay = new Lang.Class({
this._zoomOut = shouldZoom;
this._updateWorkspacesGeometry();
- if (!this._workspacesViews)
+ if (!this._workspacesViews.length)
return;
Tweener.addTween(this,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]