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

neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii

Browse Source
This commit is contained in:
[CST] Focus
2014-09-05 17:49:11 +04:00
parent f07e81c4b9
commit 420af7a4dc
45 changed files with 1767 additions and 1144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/widget/stringinput_ext.cpp
View File

@@ -31,6 +31,7 @@
#include <driver/fontrenderer.h>
#include <driver/rcinput.h>
#include <driver/screen_max.h>
#include <driver/display.h>
#include <gui/color.h>
@@ -66,7 +67,7 @@ void CExtendedInput::Init(void)
width = frameBuffer->getScreenWidth() / 100 * 45;
int tmp_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(g_Locale->getText(name));
int tmp_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(g_Locale->getText(name)); // UTF-8
width = std::max(width, tmp_w + offset);
bheight = input_h + 2*offset;
@@ -151,6 +152,7 @@ int CExtendedInput::exec( CMenuTarget* parent, const std::string & )
std::string oldval = *valueString;
std::string dispval = *valueString;
paint();
frameBuffer->blit();
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
@@ -265,6 +267,7 @@ int CExtendedInput::exec( CMenuTarget* parent, const std::string & )
*cancel = true;
res = menu_return::RETURN_EXIT_ALL;
}
frameBuffer->blit();
}
hide();
@@ -282,6 +285,7 @@ int CExtendedInput::exec( CMenuTarget* parent, const std::string & )
void CExtendedInput::hide()
{
frameBuffer->paintBackgroundBoxRel(x, y, width, height);
frameBuffer->blit();
}
void CExtendedInput::paint()
@@ -604,7 +608,7 @@ CTimeInput::CTimeInput(const neutrino_locale_t Name, std::string* Value, const n
{
valueString = Value;
frameBuffer = CFrameBuffer::getInstance();
#if 0
#if 1
// As nobody else seems to use this class I feel free to make some minor (and mostly backwards-compatible)
// adjustments to make it suitable for movieplayer playtime selection ... --martii
@@ -688,7 +692,7 @@ void CIntInput::onBeforeExec()
void CIntInput::onAfterExec()
{
*myValue = atoi((*valueString).c_str());
*myValue = atoi(*valueString);
}
//-----------------------------#################################-------------------------------------------------------