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

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

Browse Source 
Origin commit data
------------------
Commit: bcb50dacc6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-16 (Sat, 16 Sep 2017)
This commit is contained in:
vanhofen
2017-09-16 11:04:54 +02:00
parent 1f0feccf78 58e5e670c1
commit bc3aec2238
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

@@ -286,11 +286,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); CMenuOptionNumberChooser* mc = new CMenuOptionNumberChooser(LOCALE_FONTMENU_SCALING_X, &g_settings.font_scaling_x, true, 50, 200, this);
mc->setNumericInput(true); mc->setNumericInput(true);
mc->setNumberFormat("%d%%"); mc->setNumberFormat("%d%%");
mc->setHint("", LOCALE_FONTMENU_SCALING_X_HINT2);
fontscale.addItem(mc); fontscale.addItem(mc);
mc = new CMenuOptionNumberChooser(LOCALE_FONTMENU_SCALING_Y, &g_settings.font_scaling_y, true, 50, 200, this); mc = new CMenuOptionNumberChooser(LOCALE_FONTMENU_SCALING_Y, &g_settings.font_scaling_y, true, 50, 200, this);
mc->setNumericInput(true); mc->setNumericInput(true);
mc->setNumberFormat("%d%%"); mc->setNumberFormat("%d%%");
mc->setHint("", LOCALE_FONTMENU_SCALING_Y_HINT2);
fontscale.addItem(mc); fontscale.addItem(mc);
res = fontscale.exec(NULL, ""); res = fontscale.exec(NULL, "");

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

@@ -271,7 +271,7 @@ int CColorChooser::exec(CMenuTarget* parent, const std::string &)
void CColorChooser::hide() void CColorChooser::hide()
{ {
frameBuffer->paintBackgroundBoxRel(x, y, width, height); frameBuffer->paintBackgroundBoxRel(x, y, width + OFFSET_SHADOW, height + OFFSET_SHADOW);
} }
void CColorChooser::paint() void CColorChooser::paint()