neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii

Origin commit data
------------------
Branch: ni/coolstream
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-09-05 17:49:11 +04:00
parent 4c9da61afa
commit 4eb5179286
45 changed files with 1767 additions and 1144 deletions

View File

@@ -189,10 +189,10 @@ int CListBox::exec(CMenuTarget* parent, const std::string & /*actionKey*/)
{
loop = false;
}
else if (msg == CRCInput::RC_up || (int) msg == g_settings.key_channelList_pageup)
else if (msg == CRCInput::RC_up || (int) msg == g_settings.key_pageup)
{
if(getItemCount()!=0) {
int step = (msg == (neutrino_msg_t)g_settings.key_channelList_pageup) ? listmaxshow : 1; // browse or step 1
int step = (msg == (neutrino_msg_t)g_settings.key_pageup) ? listmaxshow : 1; // browse or step 1
int new_selected = selected - step;
if (new_selected < 0) {
@@ -204,10 +204,10 @@ int CListBox::exec(CMenuTarget* parent, const std::string & /*actionKey*/)
updateSelection(new_selected);
}
}
else if (msg == CRCInput::RC_down || (int) msg == g_settings.key_channelList_pagedown)
else if (msg == CRCInput::RC_down || (int) msg == g_settings.key_pagedown)
{
if(getItemCount()!=0) {
int step = ((int) msg == g_settings.key_channelList_pagedown) ? listmaxshow : 1; // browse or step 1
int step = ((int) msg == g_settings.key_pagedown) ? listmaxshow : 1; // browse or step 1
int new_selected = selected + step;
if (new_selected >= (int) getItemCount()) {
if ((getItemCount() - listmaxshow -1 < selected) && (selected != (getItemCount() - 1)) && (step != 1))