[gnome-shell/wip/paging-release2: 11/19] appDisplay: Add and rework pan action response



commit 6f2acd29ce88983effda493a84c0f35a5ce53dc4
Author: Carlos Soriano <carlos soriano89 gmail com>
Date:   Mon Aug 12 16:36:45 2013 +0200

    appDisplay: Add and rework pan action response
    
    Add pan action to AllView and rework it to take
    into account the velocity the user gives to the action
    
    https://bugzilla.gnome.org/show_bug.cgi?id=706081

 js/ui/appDisplay.js |   78 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 73 insertions(+), 5 deletions(-)
---
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index addf30e..a72b7e8 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -39,6 +39,9 @@ const FOLDER_SUBICON_FRACTION = .4;
 
 const MAX_APPS_PAGES = 20;
 
+//fraction of page height the finger or mouse must reach before
+//change page
+const PAGE_SWITCH_TRESHOLD = 0.2;
 const PAGE_SWITCH_TIME = 0.3;
 
 // Recursively load a GMenuTreeDirectory; we could put this in ShellAppSystem too
@@ -293,6 +296,17 @@ const AllView = new Lang.Class({
 
         this._pagesView.connect('scroll-event', Lang.bind(this, this._onScroll));
 
+        let panAction = new Clutter.PanAction({ interpolate: false });
+        panAction.connect('pan', Lang.bind(this, this._onPan));
+        panAction.connect('gesture-cancel', Lang.bind(this, function() {
+            this._onPanEnd(this._panAction);
+        }));
+        panAction.connect('gesture-end', Lang.bind(this, function() {
+            this._onPanEnd(this._panAction);
+        }));
+        this._panAction = panAction;
+        this._pagesView.add_action(panAction);
+        this._panning = false;
         this._clickAction = new Clutter.ClickAction();
         this._clickAction.connect('clicked', Lang.bind(this, function() {
             if (!this._currentPopup)
@@ -332,11 +346,43 @@ const AllView = new Lang.Class({
     },
 
     viewGoToPage: function(pageNumber) {
-        this._currentPage = pageNumber;
-        let params = { value: this._grid.getPageYPosition(this._currentPage),
-                       time: PAGE_SWITCH_TIME,
-                       transition: 'easeOutQuad' };
-        Tweener.addTween(this._verticalAdjustment, params);
+        let velocity;
+        if (!this._panning)
+            velocity = 0;
+        else
+            velocity = Math.abs(this._panAction.get_velocity(0)[2]);
+        // Tween the change between pages.
+        // If velocity is not specified (i.e. scrolling with mouse wheel),
+        // use the same speed regardless of original position
+        // if velocity is specified, it's in pixels per milliseconds
+        let diffToPage = this._diffToPage(pageNumber);
+        let childBox = this._pagesView.get_allocation_box();
+        let totalHeight = childBox.y2 - childBox.y1;
+        let time;
+        // Only take the velocity into account on page changes, otherwise
+        // return smoothly to the current page using the default velocity
+        if (this._currentPage != pageNumber) {
+            let min_velocity = totalHeight / (PAGE_SWITCH_TIME * 1000);
+            velocity = Math.max(min_velocity, velocity);
+            time = (diffToPage / velocity) / 1000;
+        } else {
+            time = PAGE_SWITCH_TIME * diffToPage / totalHeight;
+        }
+        // When changing more than one page, make sure to not take
+        // longer than PAGE_SWITCH_TIME
+        time = Math.min(time, PAGE_SWITCH_TIME);
+        if (pageNumber < this._grid.nPages() && pageNumber >= 0) {
+            this._currentPage = pageNumber;
+            let params = { value: this._grid.getPageYPosition(this._currentPage),
+                           time: time,
+                           transition: 'easeOutQuad' };
+            Tweener.addTween(this._verticalAdjustment, params);
+        }
+    },
+
+    _diffToPage: function (pageNumber) {
+        let currentScrollPosition = this._verticalAdjustment.value;
+        return Math.abs(currentScrollPosition - this._grid.getPageYPosition(pageNumber));
     },
 
     _onScroll: function(actor, event) {
@@ -356,6 +402,28 @@ const AllView = new Lang.Class({
         }
     },
 
+    _onPan: function(action) {
+        this._panning = true;
+        this._clickAction.release();
+        let [dist, dx, dy] = action.get_motion_delta(0);
+        let adjustment = this._verticalAdjustment;
+        adjustment.value -= (dy / this._pagesView.height) * adjustment.page_size;
+        return false;
+    },
+
+    _onPanEnd: function(action) {
+        let diffCurrentPage = this._diffToPage(this._currentPage);
+        if (diffCurrentPage > this._pagesView.height * PAGE_SWITCH_TRESHOLD) {
+            if (action.get_velocity(0)[2] > 0 && this._currentPage > 0)
+                this.goToPage(this._currentPage - 1, action);
+            else if (this._currentPage < this._grid.nPages() - 1)
+                     this.goToPage(this._currentPage + 1, action);
+        } else {
+            this.goToPage(this._currentPage, action);
+        }
+        this._panning = false;
+    },
+
     _getItemId: function(item) {
         if (item instanceof Shell.App)
             return item.get_id();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]