piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(color): number edit keyboard is not sized to suit display, cursor position is wrong (#7670)

Browse Source
This commit is contained in:
philmoz
2026-08-25 12:37:30 +10:00
committed by GitHub
parent 7f6bbd1fb9
commit 298e6e6d32
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/libui/keyboard_number.cpp
+9 -9
View File
@@ -21,7 +21,7 @@
#include "numberedit.h"
#include "keys.h"
constexpr coord_t KEYBOARD_HEIGHT = 90;
LAYOUT_VAL_SCALED(KEYBOARD_HEIGHT, 90);
NumberKeyboard* NumberKeyboard::_instance = nullptr;
static const char* const number_kb_map[] = {"<<", "-", "+", ">>", "\n",
@@ -72,42 +72,42 @@ void NumberKeyboard::handleEvent(const char* btn)
void NumberKeyboard::decLarge()
{
((NumberEdit*)field)->onEvent(EVT_VIRTUAL_KEY_BACKWARD);
field->onEvent(EVT_VIRTUAL_KEY_BACKWARD);
}
void NumberKeyboard::decSmall()
{
((NumberEdit*)field)->onEvent(EVT_VIRTUAL_KEY_MINUS);
field->onEvent(EVT_VIRTUAL_KEY_MINUS);
}
void NumberKeyboard::incSmall()
{
((NumberEdit*)field)->onEvent(EVT_VIRTUAL_KEY_PLUS);
field->onEvent(EVT_VIRTUAL_KEY_PLUS);
}
void NumberKeyboard::incLarge()
{
((NumberEdit*)field)->onEvent(EVT_VIRTUAL_KEY_FORWARD);
field->onEvent(EVT_VIRTUAL_KEY_FORWARD);
}
void NumberKeyboard::setMIN()
{
((NumberEdit*)field)->onEvent(EVT_VIRTUAL_KEY_MIN);
field->onEvent(EVT_VIRTUAL_KEY_MIN);
}
void NumberKeyboard::setMAX()
{
((NumberEdit*)field)->onEvent(EVT_VIRTUAL_KEY_MAX);
field->onEvent(EVT_VIRTUAL_KEY_MAX);
}
void NumberKeyboard::setDEF()
{
((NumberEdit*)field)->onEvent(EVT_VIRTUAL_KEY_DEFAULT);
field->onEvent(EVT_VIRTUAL_KEY_DEFAULT);
}
void NumberKeyboard::changeSign()
{
((NumberEdit*)field)->onEvent(EVT_VIRTUAL_KEY_SIGN);
field->onEvent(EVT_VIRTUAL_KEY_SIGN);
}
#if defined(HARDWARE_KEYS)
radio/src/gui/colorlcd/libui/numberedit.cpp
-5
View File
@@ -35,11 +35,6 @@ class NumberArea : public FormField
{
setWindowFlag(NO_FOCUS);
if (parent->getTextFlags() & CENTERED)
etx_obj_add_style(lvobj, styles->text_align_center, LV_PART_MAIN);
else
etx_obj_add_style(lvobj, styles->text_align_right, LV_PART_MAIN);
// Allow encoder acceleration
lv_obj_add_flag(lvobj, LV_OBJ_FLAG_ENCODER_ACCEL);