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

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

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 08231c17bf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-19 (Tue, 19 Sep 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-19 21:31:46 +02:00
parent c75f7b3525 757f054720
commit cb2c859b5e
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/components/cc_timer.cpp
View File

@@ -87,9 +87,6 @@ void* CComponentsTimer::initThreadAction(void *arg)
//start up running timer with own thread, return true on succses //start up running timer with own thread, return true on succses
void CComponentsTimer::initThread() void CComponentsTimer::initThread()
{ {
if (!tm_enable)
return;
if(!tm_thread) { if(!tm_thread) {
void *ptr = static_cast<void*>(this); void *ptr = static_cast<void*>(this);

4
src/gui/widget/keychooser.cpp
View File

@@ -68,7 +68,7 @@ int CKeyChooserItem::exec(CMenuTarget* parent, const std::string &)
int timeout = 10; int timeout = 10;
CHintBox hintbox(name, LOCALE_KEYCHOOSER_TEXT, HINTBOX_MIN_WIDTH, NEUTRINO_ICON_SETTINGS, NEUTRINO_ICON_HINT_KEYS); CHintBox hintbox(name, LOCALE_KEYCHOOSER_TEXT, HINTBOX_MIN_WIDTH, NEUTRINO_ICON_SETTINGS, NEUTRINO_ICON_HINT_KEYS);
//hintbox.setTimeOut(timeout); hintbox.setTimeOut(timeout);
hintbox.paint(); hintbox.paint();
CFrameBuffer::getInstance()->blit(); CFrameBuffer::getInstance()->blit();
@@ -79,6 +79,7 @@ int CKeyChooserItem::exec(CMenuTarget* parent, const std::string &)
timeoutEnd = CRCInput::calcTimeoutEnd(timeout); timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
get_Message: get_Message:
hintbox.enableTimeOutBar();
g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd ); g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd );
if (msg != CRCInput::RC_timeout) if (msg != CRCInput::RC_timeout)
@@ -92,6 +93,7 @@ int CKeyChooserItem::exec(CMenuTarget* parent, const std::string &)
} }
g_RCInput->setLongPressAny(false); g_RCInput->setLongPressAny(false);
hintbox.disableTimeOutBar();
hintbox.hide(); hintbox.hide();
return res; return res;
} }

13
src/gui/widget/menue.cpp
View File

@@ -1100,16 +1100,17 @@ void CMenuWidget::integratePlugins(int integration, const unsigned int shortcut,
void CMenuWidget::hide() void CMenuWidget::hide()
{ {
if(savescreen && background) if(savescreen && background) {
ResetModules();
restoreScreen();//FIXME restoreScreen();//FIXME
else { } else {
if (header) if (header)
header->kill(); header->kill();
if (info_box) if (info_box)
info_box->kill(); info_box->kill();
if (details_line) if (details_line)
details_line->hide(); details_line->hide();
frameBuffer->paintBackgroundBoxRel(x, y, full_width, full_height + footer_height); frameBuffer->paintBackgroundBoxRel(x, y, full_width, full_height/* + footer_height*/); // full_height includes footer_height : see calcSize
//paintHint(-1); //paintHint(-1);
} }
paintHint(-1); paintHint(-1);
@@ -1329,7 +1330,7 @@ void CMenuWidget::setMenuPos(const int& menu_width)
int scr_y = frameBuffer->getScreenY(); int scr_y = frameBuffer->getScreenY();
int scr_w = frameBuffer->getScreenWidth(); int scr_w = frameBuffer->getScreenWidth();
int scr_h = frameBuffer->getScreenHeight(); int scr_h = frameBuffer->getScreenHeight();
int real_h = full_height + footer_height + hint_height; int real_h = full_height/* + footer_height*/ + hint_height; // full_height includes footer_height : see calcSize
int x_old = x; int x_old = x;
int y_old = y; int y_old = y;
//configured positions //configured positions
@@ -1449,7 +1450,7 @@ void CMenuWidget::saveScreen()
return; return;
delete[] background; delete[] background;
saveScreen_height = full_height+footer_height; saveScreen_height = full_height/* + footer_height*/; // full_height includes footer_height : see calcSize
saveScreen_width = full_width; saveScreen_width = full_width;
saveScreen_y = y; saveScreen_y = y;
saveScreen_x = x; saveScreen_x = x;
@@ -1482,7 +1483,7 @@ void CMenuWidget::enableSaveScreen(bool enable)
void CMenuWidget::paintHint(int pos) void CMenuWidget::paintHint(int pos)
{ {
if (!g_settings.show_menu_hints){ if (!g_settings.show_menu_hints){
ResetModules(); //ensure clean up on changed setting //ResetModules(); //ensure clean up on changed setting
return; return;
} }