fix scrolling in browsers being reversed

The-Powder-Toy · Jun 1, 2018 · 0e383e1 · 0e383e1
1 parent 48a333f
commit 0e383e1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/gui/localbrowser/LocalBrowserController.cpp b/src/gui/localbrowser/LocalBrowserController.cpp
@@ -124,7 +124,7 @@ void LocalBrowserController::SetPage(int page)
 void LocalBrowserController::SetPageRelative(int offset)
 {
 	int page = std::min(std::max(browserModel->GetPageNum() + offset, 1), browserModel->GetPageCount());
-	if(page != browserModel->GetPageCount())
+	if (page != browserModel->GetPageNum())
 		browserModel->UpdateSavesList(page);
 }
 

diff --git a/src/gui/localbrowser/LocalBrowserView.cpp b/src/gui/localbrowser/LocalBrowserView.cpp
@@ -245,8 +245,8 @@ void LocalBrowserView::NotifySelectedChanged(LocalBrowserModel * sender)
 
 void LocalBrowserView::OnMouseWheel(int x, int y, int d)
 {
-	if(d)
-		c->SetPageRelative(d);
+	if (d)
+		c->SetPageRelative(-d);
 }
 
 void LocalBrowserView::OnKeyPress(int key, int scan, bool repeat, bool shift, bool ctrl, bool alt)

diff --git a/src/gui/search/SearchController.cpp b/src/gui/search/SearchController.cpp
@@ -137,7 +137,7 @@ void SearchController::SetPage(int page)
 void SearchController::SetPageRelative(int offset)
 {
 	int page = std::min(std::max(searchModel->GetPageNum() + offset, 1), searchModel->GetPageCount());
-	if(page != searchModel->GetPageCount())
+	if (page != searchModel->GetPageNum())
 		searchModel->UpdateSaveList(page, searchModel->GetLastQuery());
 }
 

diff --git a/src/gui/search/SearchView.cpp b/src/gui/search/SearchView.cpp
@@ -778,8 +778,8 @@ void SearchView::OnTick(float dt)
 
 void SearchView::OnMouseWheel(int x, int y, int d)
 {
-	if(d)
-		c->SetPageRelative(d);
+	if (d)
+		c->SetPageRelative(-d);
 }
 void SearchView::OnKeyPress(int key, int scan, bool repeat, bool shift, bool ctrl, bool alt)
 {