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

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

Browse Source 
Conflicts:
	src/gui/plugins.cpp
	src/gui/plugins.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: a11e7df409
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-08 12:24:32 +02:00
parent c5d81a62c4 ef1606884b
commit 022ceb42c9
14 changed files with 86 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1058,7 +1058,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
return retval;
}
void CMenuWidget::integratePlugins(CPlugins::i_type_t integration, const unsigned int shortcut, bool enabled)
void CMenuWidget::integratePlugins(int integration, const unsigned int shortcut, bool enabled)
{
bool separatorline = false;
unsigned int number_of_plugins = (unsigned int) g_Plugins->getNumberOfPlugins();
@@ -1225,7 +1225,7 @@ void CMenuWidget::calcSize()
//scrollbar width
scrollbar_width=0;
if (total_pages > 1)
scrollbar_width = scrollbar_width;
scrollbar_width = SCROLLBAR_WIDTH;
full_width = width + scrollbar_width + OFFSET_SHADOW;
full_height = height + fbutton_height + OFFSET_SHADOW + OFFSET_INTER; // hintbox is handled separately