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 branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c1803eacac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-01-29 21:32:04 +01:00
parent f70f7df777 410a22345b
commit d9a8d365f7
16 changed files with 135 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -565,6 +565,7 @@ CMenuWidget::CMenuWidget()
info_box = NULL;
header = NULL;
nextShortcut = 1;
x = y = 0;
}
CMenuWidget::CMenuWidget(const neutrino_locale_t Name, const std::string & Icon, const int mwidth, const mn_widget_id_t &w_index)
@@ -639,6 +640,7 @@ void CMenuWidget::Init(const std::string &Icon, const int mwidth, const mn_widge
nextShortcut = 1;
saveScreen_width = 0;
saveScreen_height = 0;
x = y = 0;
}
void CMenuWidget::move(int xoff, int yoff)