mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 01:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-09-26 12:52:04 +02:00
parent 8dad062eff ca09c92542
commit b7ceb705a0
52 changed files with 1130 additions and 892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/widget/Makefile.am
View File

@@ -10,6 +10,7 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/lib/libconfigfile \
@SIGC_CFLAGS@ \
@FREETYPE_CFLAGS@ \
@LUA_CFLAGS@ \
@HWLIB_CFLAGS@
noinst_LIBRARIES = libneutrino_gui_widget.a libneutrino_gui_widget2.a

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

@@ -799,6 +799,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
switch ( rv ) {
case menu_return::RETURN_EXIT_ALL:
retval = menu_return::RETURN_EXIT_ALL;
/* fall through */
case menu_return::RETURN_EXIT:
msg = CRCInput::RC_timeout;
break;
@@ -889,6 +890,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
break;
case CRCInput::RC_up:
dir = -1;
/* fall through */
default: /* fallthrough or RC_down => dir = 1 */
pos += dir;
if (pos < 0 || pos >= (int)items.size())
@@ -925,16 +927,12 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
break;
}
case (CRCInput::RC_left):
{
if(hasItem() && selected > -1 && (int)items.size() > selected) {
CMenuItem* itemX = items[selected];
if (!itemX->isMenueOptionChooser()) {
if (g_settings.menu_left_exit)
msg = CRCInput::RC_timeout;
break;
}
}
if (hasItem() && selected > -1 && (int)items.size() > selected) {
CMenuItem* itemX = items[selected];
if (!itemX->isMenueOptionChooser() && g_settings.menu_left_exit)
msg = CRCInput::RC_timeout;
}
break;
case (CRCInput::RC_right):
case (CRCInput::RC_ok):
{
@@ -949,6 +947,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
switch ( rv ) {
case menu_return::RETURN_EXIT_ALL:
retval = menu_return::RETURN_EXIT_ALL;
/* fall through */
case menu_return::RETURN_EXIT:
msg = CRCInput::RC_timeout;
break;
@@ -1140,11 +1139,11 @@ void CMenuWidget::calcSize()
hint_height = 0;
if(g_settings.show_menu_hints && has_hints) {
int lines = 2;
int text_height = 2*OFFSET_INNER_MID + lines*g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT]->getHeight();
int text_height = 2*OFFSET_INNER_SMALL + lines*g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT]->getHeight();
/* assuming all hint icons has the same size ! */
int icon_width, icon_height;
frameBuffer->getIconSize(NEUTRINO_ICON_HINT_TVMODE, &icon_width, &icon_height);
icon_height += 2*OFFSET_INNER_MID;
icon_height += 2*OFFSET_INNER_SMALL;
hint_height = std::max(icon_height, text_height);
}
/* set the max height to 9/10 of usable screen height
@@ -1202,11 +1201,12 @@ void CMenuWidget::calcSize()
// shrink menu if less items
height = std::min(height, hheight + maxItemHeight);
/*
Always add a bottom offset.
Always add a bottom separator offset.
Most menus has an upper offset too,
which is added with the intro-items
*/
height += OFFSET_INNER_MID;
CMenuItem *separator = new CMenuSeparator();
height += separator->getHeight();
//scrollbar width
scrollbar_width=0;

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

@@ -361,6 +361,8 @@ private:
void setNumberFormat(std::string format) { numberFormat = format; }
void setNumberFormat(std::string (*fun)(int)) { numberFormatFunction = fun; }
void setNumericInput(bool _numeric_input) { numeric_input = _numeric_input; }
void setLocalizedValue(int special_value) { localized_value = special_value; }
void setLocalizedValueName(neutrino_locale_t special_value_name) { localized_value_name = special_value_name; }
};
class CMenuOptionChooserOptions