[gnome-shell] overview: Use a MetaWindow argument in window-drag-* signals/API
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] overview: Use a MetaWindow argument in window-drag-* signals/API
- Date: Thu, 11 Sep 2014 22:58:15 +0000 (UTC)
commit 33e35f269fbe84cc07543a3cec10478ad5b11385
Author: Carlos Garnacho <carlosg gnome org>
Date: Wed Sep 3 21:55:05 2014 +0200
overview: Use a MetaWindow argument in window-drag-* signals/API
It is quite weird to have those calls/signals using WindowClone as an
argument, it is neater to pass MetaWindows around, and have each user
deal with their own representations of these.
https://bugzilla.gnome.org/show_bug.cgi?id=735972
js/ui/overview.js | 12 ++++++------
js/ui/workspace.js | 6 +++---
js/ui/workspaceThumbnail.js | 6 +++---
js/ui/workspacesView.js | 4 ++--
4 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/js/ui/overview.js b/js/ui/overview.js
index 3be62bd..c89fef5 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -435,17 +435,17 @@ const Overview = new Lang.Class({
this._inDrag = false;
},
- beginWindowDrag: function(clone) {
- this.emit('window-drag-begin', clone);
+ beginWindowDrag: function(window) {
+ this.emit('window-drag-begin', window);
this._inDrag = true;
},
- cancelledWindowDrag: function(clone) {
- this.emit('window-drag-cancelled', clone);
+ cancelledWindowDrag: function(window) {
+ this.emit('window-drag-cancelled', window);
},
- endWindowDrag: function(clone) {
- this.emit('window-drag-end', clone);
+ endWindowDrag: function(window) {
+ this.emit('window-drag-end', window);
this._inDrag = false;
},
diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index cee9ae5..07f1b3e 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -1818,16 +1818,16 @@ const Workspace = new Lang.Class({
Lang.bind(this, this._onCloneSelected));
clone.connect('drag-begin',
Lang.bind(this, function() {
- Main.overview.beginWindowDrag(clone);
+ Main.overview.beginWindowDrag(clone.metaWindow);
overlay.hide();
}));
clone.connect('drag-cancelled',
Lang.bind(this, function() {
- Main.overview.cancelledWindowDrag(clone);
+ Main.overview.cancelledWindowDrag(clone.metaWindow);
}));
clone.connect('drag-end',
Lang.bind(this, function() {
- Main.overview.endWindowDrag(clone);
+ Main.overview.endWindowDrag(clone.metaWindow);
overlay.show();
}));
clone.connect('size-changed',
diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index 8cd8aff..ea859c7 100644
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -518,15 +518,15 @@ const WorkspaceThumbnail = new Lang.Class({
}));
clone.connect('drag-begin',
Lang.bind(this, function() {
- Main.overview.beginWindowDrag(clone);
+ Main.overview.beginWindowDrag(clone.metaWindow);
}));
clone.connect('drag-cancelled',
Lang.bind(this, function() {
- Main.overview.cancelledWindowDrag(clone);
+ Main.overview.cancelledWindowDrag(clone.metaWindow);
}));
clone.connect('drag-end',
Lang.bind(this, function() {
- Main.overview.endWindowDrag(clone);
+ Main.overview.endWindowDrag(clone.metaWindow);
}));
this._contents.add_actor(clone.actor);
diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 9e75661..ba3a120 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -63,9 +63,9 @@ const WorkspacesViewBase = new Lang.Class({
}
},
- _dragBegin: function(overview, clone) {
+ _dragBegin: function(overview, window) {
this._inDrag = true;
- this._setReservedSlot(clone.metaWindow);
+ this._setReservedSlot(window);
},
_dragEnd: function() {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]