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

Merge remote-tracking branch 'uncool/cst-next'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-12-28 16:15:14 +01:00
parent 5c7d94cee0 2106ee8f45
commit 0a95a07654
122 changed files with 5543 additions and 2589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/user_menue.cpp
View File

@@ -164,15 +164,21 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
if (menu == NULL)
return true;
/*
using native callback to ensure paint for info clock after hide of this menu window
menu->hide() handler comes too early, nice to see if clock is transparent.
*/
menu->OnAfterHide.connect(sigc::mem_fun(CInfoClock::getInstance(), &CInfoClock::block));
if (button < COL_BUTTONMAX)
menu->setSelected(user_menu[button].selected);
//show cancel button if configured
if (g_settings.personalize[SNeutrinoSettings::P_UMENU_SHOW_CANCEL])
menu->addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, CMenuWidget::BTN_TYPE_CANCEL);
else
menu->addItem(GenericMenuSeparator);
bool _mode_ts = CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_ts;
std::string itemstr_last("1");
@@ -455,7 +461,6 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
extern CInfoClock *InfoClock;
InfoClock->enableInfoClock(false);
// show menu if there are more than 2 items only
// otherwise, we start the item directly (must be the last one)
if (menu_items > 1 )