[gnome-shell] workspacesView: Fix activating empty workspaces
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] workspacesView: Fix activating empty workspaces
- Date: Fri, 17 Jan 2014 14:31:28 +0000 (UTC)
commit 11d8640ba6e5cb3276d915a316f00f13a3568b8a
Author: Florian Müllner <fmuellner gnome org>
Date: Fri Jan 17 08:25:49 2014 -0500
workspacesView: Fix activating empty workspaces
By default, gesture actions no longer wait for the dnd threshold to
be reached before triggering, which breaks our mixing of click- and
pan actions. Fix this by only panning after reaching the threshold
and letting the click action go through if the pan is cancelled.
https://bugzilla.gnome.org/show_bug.cgi?id=722417
js/ui/workspacesView.js | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 1d0982b..59e9682 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -405,7 +405,7 @@ const WorkspacesDisplay = new Lang.Class({
Main.overview.addAction(clickAction);
this.actor.bind_property('mapped', clickAction, 'enabled', GObject.BindingFlags.SYNC_CREATE);
- let panAction = new Clutter.PanAction();
+ let panAction = new Clutter.PanAction({ threshold_trigger_edge: Clutter.GestureTriggerEdge.AFTER });
panAction.connect('pan', Lang.bind(this, this._onPan));
panAction.connect('gesture-begin', Lang.bind(this, function() {
for (let i = 0; i < this._workspacesViews.length; i++)
@@ -413,7 +413,6 @@ const WorkspacesDisplay = new Lang.Class({
return true;
}));
panAction.connect('gesture-cancel', Lang.bind(this, function() {
- clickAction.release();
for (let i = 0; i < this._workspacesViews.length; i++)
this._workspacesViews[i].endSwipeScroll();
}));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]