mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 38f17cd88b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)
This commit is contained in:
vanhofen
2016-12-06 20:46:37 +01:00
parent 9086c24617 3fd9316582
commit 73ca7cf0c8
24 changed files with 566 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/components/cc_frm.cpp
View File

@@ -636,9 +636,9 @@ void CComponentsForm::ScrollPage(int direction, bool do_paint)
int target_page_id = (int)page_count - 1;
int target_page = (int)cur_page;
if (direction == SCROLL_P_DOWN)
if (direction == SCROLL_P_UP)
target_page = target_page+1 > target_page_id ? 0 : target_page+1;
else if (direction == SCROLL_P_UP)
else if (direction == SCROLL_P_DOWN)
target_page = target_page-1 < 0 ? target_page_id : target_page-1;
if (do_paint)