brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

appDisplay: Move boundary page assertions

Browse Source 
Since the function that manages the changes between pages is
goToPage, just move the assertions of page >= 0 and page < nPages
to that function

https://bugzilla.gnome.org/show_bug.cgi?id=707979
This commit is contained in:
Carlos Soriano 2013-09-13 18:53:02 +02:00
parent 7c78e1fbf5
commit f38091d96b
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/ui/appDisplay.js
View File

@ -342,6 +342,8 @@ const AllView = new Lang.Class({
}, },
goToPage: function(pageNumber) { goToPage: function(pageNumber) {
if(pageNumber < 0 || pageNumber > this._grid.nPages() - 1)
return;
if (this._currentPage == pageNumber && this._displayingPopup && this._currentPopup) if (this._currentPage == pageNumber && this._displayingPopup && this._currentPopup)
return; return;
if (this._displayingPopup && this._currentPopup) if (this._displayingPopup && this._currentPopup)
@ -403,16 +405,13 @@ const AllView = new Lang.Class({
_onScroll: function(actor, event) { _onScroll: function(actor, event) {
if (this._displayingPopup) if (this._displayingPopup)
return true; return true;
let direction = event.get_scroll_direction(); let direction = event.get_scroll_direction();
if (direction == Clutter.ScrollDirection.UP) { if (direction == Clutter.ScrollDirection.UP)
if (this._currentPage > 0)
this.goToPage(this._currentPage - 1); this.goToPage(this._currentPage - 1);
} else { else if (direction == Clutter.ScrollDirection.DOWN)
if (direction == Clutter.ScrollDirection.DOWN) {
if (this._currentPage < (this._grid.nPages() - 1))
this.goToPage(this._currentPage + 1); this.goToPage(this._currentPage + 1);
}
}
return true; return true;
}, },
@ -432,9 +431,9 @@ const AllView = new Lang.Class({
return; return;
let diffCurrentPage = this._diffToPage(this._currentPage); let diffCurrentPage = this._diffToPage(this._currentPage);
if (diffCurrentPage > this._scrollView.height * PAGE_SWITCH_TRESHOLD) { if (diffCurrentPage > this._scrollView.height * PAGE_SWITCH_TRESHOLD) {
if (action.get_velocity(0)[2] > 0 && this._currentPage > 0) if (action.get_velocity(0)[2] > 0)
this.goToPage(this._currentPage - 1); this.goToPage(this._currentPage - 1);
else if (this._currentPage < this._grid.nPages() - 1) else
this.goToPage(this._currentPage + 1); this.goToPage(this._currentPage + 1);
} else { } else {
this.goToPage(this._currentPage); this.goToPage(this._currentPage);