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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1875ced1c5
Author: gixxpunk <thomas.harfmann@gmail.com>
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:
gixxpunk
2017-09-19 18:37:22 +02:00
parent 0412a5aa23 257d3f3cfb
commit 34c98e23c4
2 changed files with 7 additions and 9 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);

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

@@ -1101,16 +1101,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);
@@ -1330,7 +1331,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
@@ -1450,7 +1451,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;
@@ -1483,7 +1484,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;
} }