[gnome-shell] workspacesView: simplify code
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] workspacesView: simplify code
- Date: Thu, 14 Feb 2013 23:19:16 +0000 (UTC)
commit c550e2ccf5b350ff8d72b5343dd07dece080aa06
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Thu Dec 13 16:09:11 2012 -0500
workspacesView: simplify code
We always pass the same coordinates to setGeometry and setClipRect in
WorkspacesView; remove the latter to simplify code.
https://bugzilla.gnome.org/show_bug.cgi?id=682050
js/ui/workspacesView.js | 26 ++------------------------
1 files changed, 2 insertions(+), 24 deletions(-)
---
diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 1a56546..8bb589f 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -46,10 +46,6 @@ const WorkspacesView = new Lang.Class({
this._height = 0;
this._x = 0;
this._y = 0;
- this._clipX = 0;
- this._clipY = 0;
- this._clipWidth = 0;
- this._clipHeight = 0;
this._spacing = 0;
this._animating = false; // tweening
this._scrolling = false; // swipe-scrolling
@@ -88,8 +84,8 @@ const WorkspacesView = new Lang.Class({
this._overviewShownId =
Main.overview.connect('shown',
Lang.bind(this, function() {
- this.actor.set_clip(this._clipX, this._clipY,
- this._clipWidth, this._clipHeight);
+ this.actor.set_clip(this._x, this._y,
+ this._width, this._height);
}));
this.scrollAdjustment = new St.Adjustment({ value: activeWorkspaceIndex,
@@ -156,13 +152,6 @@ const WorkspacesView = new Lang.Class({
this._workspaces[i].setGeometry(x, y, width, height);
},
- setClipRect: function(x, y, width, height) {
- this._clipX = x;
- this._clipY = y;
- this._clipWidth = width;
- this._clipHeight = height;
- },
-
_lookupWorkspaceForMetaWindow: function (metaWindow) {
for (let i = 0; i < this._workspaces.length; i++) {
if (this._workspaces[i].containsMetaWindow(metaWindow))
@@ -636,24 +625,13 @@ const WorkspacesDisplay = new Lang.Class({
let rtl = (Clutter.get_default_text_direction () == Clutter.TextDirection.RTL);
- let clipWidth = width;
- let clipHeight = fullHeight;
- let clipX = x;
- let clipY = y + (fullHeight - clipHeight) / 2;
-
let monitors = Main.layoutManager.monitors;
let m = 0;
for (let i = 0; i < monitors.length; i++) {
if (i == this._primaryIndex) {
- this._workspacesViews[m].setClipRect(clipX, clipY,
- clipWidth, clipHeight);
this._workspacesViews[m].setGeometry(x, y, width, height);
m++;
} else if (!this._workspacesOnlyOnPrimary) {
- this._workspacesViews[m].setClipRect(monitors[i].x,
- monitors[i].y,
- monitors[i].width,
- monitors[i].height);
this._workspacesViews[m].setGeometry(monitors[i].x,
monitors[i].y,
monitors[i].width,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]