mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 00:41:09 +02:00
COsdSetup: try to fix multiple item arrangement while open osd settings
Origin commit data
------------------
Branch: ni/coolstream
Commit: a78721f640
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-29 (Tue, 29 Dec 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -510,15 +510,14 @@ int COsdSetup::showOsdSetup()
|
|||||||
osd_menu = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, width, MN_WIDGET_ID_OSDSETUP);
|
osd_menu = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, width, MN_WIDGET_ID_OSDSETUP);
|
||||||
osd_menu->setWizardMode(is_wizard);
|
osd_menu->setWizardMode(is_wizard);
|
||||||
|
|
||||||
//menu colors
|
|
||||||
if (osd_menu_colors == NULL)
|
|
||||||
osd_menu_colors = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, width, MN_WIDGET_ID_OSDSETUP_MENUCOLORS);
|
|
||||||
|
|
||||||
//intro with subhead and back button
|
//intro with subhead and back button
|
||||||
osd_menu->addIntroItems(LOCALE_MAINSETTINGS_OSD);
|
osd_menu->addIntroItems(LOCALE_MAINSETTINGS_OSD);
|
||||||
|
|
||||||
//item menu colors
|
//item menu colors
|
||||||
showOsdMenueColorSetup(osd_menu_colors);
|
if (osd_menu_colors == NULL){
|
||||||
|
osd_menu_colors = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, width, MN_WIDGET_ID_OSDSETUP_MENUCOLORS);
|
||||||
|
showOsdMenueColorSetup(osd_menu_colors);
|
||||||
|
}
|
||||||
CMenuForwarder * mf = new CMenuForwarder(LOCALE_COLORMENU_MENUCOLORS, true, NULL, osd_menu_colors, NULL, CRCInput::RC_red);
|
CMenuForwarder * mf = new CMenuForwarder(LOCALE_COLORMENU_MENUCOLORS, true, NULL, osd_menu_colors, NULL, CRCInput::RC_red);
|
||||||
mf->setHint("", LOCALE_MENU_HINT_COLORS);
|
mf->setHint("", LOCALE_MENU_HINT_COLORS);
|
||||||
osd_menu->addItem(mf);
|
osd_menu->addItem(mf);
|
||||||
|
Reference in New Issue
Block a user