mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/filebrowser: fix page up/down

Browse Source 
Conflicts:
	src/gui/filebrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f63c3da37c
Author: martii <m4rtii@gmx.de>
Date: 2014-04-09 (Wed, 09 Apr 2014)



------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-04-09 22:05:08 +02:00
committed by [CST] Focus
parent 9330027e22
commit 5bb83aadc1
1 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/gui/filebrowser.cpp
View File

@@ -806,41 +806,6 @@ bool CFileBrowser::exec(const char * const dirname)
msg_repeatok = CRCInput::RC_down; // jump to next item
}
}
else if ((msg == CRCInput::RC_red) || msg == (neutrino_msg_t) g_settings.key_pagedown)
{
if (!(filelist.empty())) {
unsigned int last = filelist.size() - 1;
if (selected != last && selected + listmaxshow >= filelist.size()) {
unsigned int prevselected = selected;
selected = last;
paintItem(prevselected - liststart);
paintItem(selected - liststart);
}
else
{
selected = (selected == last) ? 0 : selected + listmaxshow;
liststart = (selected / listmaxshow) * listmaxshow;
paint();
}
}
}
else if (msg == CRCInput::RC_green || msg == (neutrino_msg_t) g_settings.key_pageup)
{
if (!(filelist.empty())) {
if (selected && selected < listmaxshow) {
unsigned int prevselected = selected;
selected = 0;
paintItem(prevselected - liststart);
paintItem(selected - liststart);
}
else
{
selected = selected ? selected - listmaxshow : filelist.size() - 1;
liststart = (selected/listmaxshow)*listmaxshow;
paint();
}
}
}
else if (msg_repeatok == CRCInput::RC_up)
{
if (!(filelist.empty()))
@@ -930,6 +895,35 @@ bool CFileBrowser::exec(const char * const dirname)
ChangeDir("..");
}
}
else if ((msg == CRCInput::RC_red) || msg == (neutrino_msg_t) g_settings.key_pagedown)
{
if (!(filelist.empty())) {
unsigned int last = filelist.size() - 1;
if (selected != last && selected + listmaxshow >= filelist.size()) {
selected = last;
}
else
{
selected = (selected == last) ? 0 : selected + listmaxshow;
liststart = (selected / listmaxshow) * listmaxshow;
}
paint();
}
}
else if (msg == CRCInput::RC_green || msg == (neutrino_msg_t) g_settings.key_pageup)
{
if (!(filelist.empty())) {
if (selected && selected < listmaxshow) {
selected = 0;
}
else
{
selected = selected ? selected - listmaxshow : filelist.size() - 1;
liststart = (selected/listmaxshow)*listmaxshow;
}
paint();
}
}
else if ( msg == CRCInput::RC_blue )
{
if(Filter != NULL)