mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +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 
Conflicts:
	src/gui/widget/colorchooser.cpp


Origin commit data
------------------
Commit: 10c224c00e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-16 (Sat, 16 Sep 2017)
This commit is contained in:
vanhofen
2017-09-16 11:03:04 +02:00
parent b18675eb20 64f30884ed
commit 58e5e670c1
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/osd_setup.cpp
View File

@@ -284,11 +284,13 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
CMenuOptionNumberChooser* mc = new CMenuOptionNumberChooser(LOCALE_FONTMENU_SCALING_X, &g_settings.font_scaling_x, true, 50, 200, this);
mc->setNumericInput(true);
mc->setNumberFormat("%d%%");
mc->setHint("", LOCALE_FONTMENU_SCALING_X_HINT2);
fontscale.addItem(mc);
mc = new CMenuOptionNumberChooser(LOCALE_FONTMENU_SCALING_Y, &g_settings.font_scaling_y, true, 50, 200, this);
mc->setNumericInput(true);
mc->setNumberFormat("%d%%");
mc->setHint("", LOCALE_FONTMENU_SCALING_Y_HINT2);
fontscale.addItem(mc);
res = fontscale.exec(NULL, "");