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

stringinput: font scaling factors < 100 could not be entered

Browse Source
This commit is contained in:
Stefan Seyfried
2012-04-01 15:58:31 +02:00
parent 779aa5b947
commit 004f736b68
1 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/gui/widget/stringinput.cpp
View File

@@ -4,6 +4,8 @@
Copyright (C) 2001 Steffen Hehn 'McClean' Copyright (C) 2001 Steffen Hehn 'McClean'
Homepage: http://dbox.cyberphoria.org/ Homepage: http://dbox.cyberphoria.org/
Copyright (C) 2009-2012 Stefan Seyfried
Kommentar: Kommentar:
Diese GUI wurde von Grund auf neu programmiert und sollte nun vom Diese GUI wurde von Grund auf neu programmiert und sollte nun vom
@@ -191,13 +193,26 @@ void CStringInput::NormalKeyPressed(const neutrino_msg_t key)
std::string tmp_value = value; std::string tmp_value = value;
value[selected] = validchars[CRCInput::getNumericValue(key)]; value[selected] = validchars[CRCInput::getNumericValue(key)];
int current_value = atoi(value); int current_value = atoi(value);
int tmp = current_value;
if (current_value <= lower_bound)
current_value = lower_bound + 1;
else if (current_value >= upper_bound)
current_value = upper_bound - 1;
if (tmp != current_value) /* size + 1 is correct, snprintf includes always '\0' */
snprintf(value, size + 1, "%*d", size, current_value);
if( (lower_bound == -1 || upper_bound == -1) || (current_value > 0 && current_value > lower_bound && current_value < upper_bound) ){ if( (lower_bound == -1 || upper_bound == -1) || (current_value > 0 && current_value > lower_bound && current_value < upper_bound) ){
if (selected < (size - 1)) if (selected < (size - 1))
{ {
selected++; selected++;
paintChar(selected - 1); paintChar(selected - 1);
} }
paintChar(selected); if (tmp != current_value)
{
for (tmp = 0; tmp < size; tmp++)
paintChar(tmp);
}
else
paintChar(selected);
}else{ }else{
snprintf(value, sizeof(value),"%s",tmp_value.c_str()); snprintf(value, sizeof(value),"%s",tmp_value.c_str());
} }
@@ -276,8 +291,21 @@ void CStringInput::keyUpPressed()
value[selected]=validchars[npos]; value[selected]=validchars[npos];
int current_value = atoi(value); int current_value = atoi(value);
int tmp = current_value;
if (current_value <= lower_bound)
current_value = lower_bound + 1;
else if (current_value >= upper_bound)
current_value = upper_bound - 1;
if (tmp != current_value) /* size + 1 is correct, snprintf includes always '\0' */
snprintf(value, size + 1, "%*d", size, current_value);
if( (lower_bound == -1 || upper_bound == -1) || (current_value > 0 && current_value > lower_bound && current_value < upper_bound) ){ if( (lower_bound == -1 || upper_bound == -1) || (current_value > 0 && current_value > lower_bound && current_value < upper_bound) ){
paintChar(selected); if (tmp != current_value)
{
for (tmp = 0; tmp < size; tmp++)
paintChar(tmp);
}
else
paintChar(selected);
}else{ }else{
snprintf(value, sizeof(value),"%s",tmp_value.c_str()); snprintf(value, sizeof(value),"%s",tmp_value.c_str());
} }
@@ -296,8 +324,21 @@ void CStringInput::keyDownPressed()
value[selected]=validchars[npos]; value[selected]=validchars[npos];
int current_value = atoi(value); int current_value = atoi(value);
int tmp = current_value;
if (current_value <= lower_bound)
current_value = lower_bound + 1;
else if (current_value >= upper_bound)
current_value = upper_bound - 1;
if (tmp != current_value) /* size + 1 is correct, snprintf includes always '\0' */
snprintf(value, size + 1, "%*d", size, current_value);
if( (lower_bound == -1 || upper_bound == -1) || (current_value > 0 && current_value > lower_bound && current_value < upper_bound) ){ if( (lower_bound == -1 || upper_bound == -1) || (current_value > 0 && current_value > lower_bound && current_value < upper_bound) ){
paintChar(selected); if (tmp != current_value)
{
for (tmp = 0; tmp < size; tmp++)
paintChar(tmp);
}
else
paintChar(selected);
}else{ }else{
snprintf(value, sizeof(value),"%s",tmp_value.c_str()); snprintf(value, sizeof(value),"%s",tmp_value.c_str());
} }