[TextEdit] Fix

This commit is contained in:
Bertrand Songis
2020-10-27 15:19:08 +01:00
parent a3f4390a25
commit 7456f99b24
4 changed files with 10 additions and 5 deletions
+1
View File
@@ -59,6 +59,7 @@ class FormField: public Window {
virtual void setEditMode(bool newEditMode)
{
editMode = newEditMode;
invalidate();
}
void enable(bool value = true)
+7 -2
View File
@@ -125,18 +125,23 @@ void NumberEdit::onEvent(event_t event)
FormField::onEvent(event);
}
#if defined(SOFTWARE_KEYBOARD)
#if defined(HARDWARE_TOUCH)
bool NumberEdit::onTouchEnd(coord_t, coord_t)
{
if (!enabled) {
return true;
}
if (!hasFocus()) {
if (hasFocus()) {
setEditMode(true);
}
else {
setFocus(SET_FOCUS_DEFAULT);
}
#if defined(SOFTWARE_KEYBOARD)
NumberKeyboard::show(this);
#endif
return true;
}
+1 -1
View File
@@ -63,7 +63,7 @@ class NumberEdit : public BaseNumberEdit {
void onEvent(event_t event) override;
#if defined(SOFTWARE_KEYBOARD)
#if defined(HARDWARE_TOUCH)
bool onTouchEnd(coord_t x, coord_t y) override;
#endif
+1 -2
View File
@@ -106,11 +106,10 @@ class TextEdit : public FormField {
return 'Z';
else if (c == '0')
return 'z';
else if (c == ' ')
else if (c == ' ' || c == 0)
return '>';
else
return c - 1;
}
};