Merge develop into main (#338)
### Cardputer: - Fix keyboard issue with up/down button conflict when selecting switch - Fix backlight flickering ### UI improvements - Removed a 3 pixel border that went around the entire desktop environment - Improved system layout (GuiService) - Statusbar: improved layout (mainly margin/padding) - Toolbar: fixed margin/padding of all buttons, fixed alignment of all content - Improved layout/UI of many apps ### Other - Update LVGL to 9.3.0 official release (was dev version)
This commit is contained in:
committed by
GitHub
parent
53b711584f
commit
a2af95b92d
@@ -62,11 +62,23 @@ void CardputerKeyboard::readCallback(lv_indev_t* indev, lv_indev_data_t* data) {
|
||||
} else {
|
||||
for (auto& i : self->keyboard.keysState().values) {
|
||||
if (i == ';') { // Up
|
||||
data->key = LV_KEY_UP;
|
||||
data->state = LV_INDEV_STATE_PRESSED;
|
||||
/*
|
||||
* WARNING:
|
||||
* lv_switch picks up on this and toggles it, while the CardputerEncoder uses it for scrolling.
|
||||
* We disable the keypress so the encoder can work properly.
|
||||
*/
|
||||
// TODO: Can we detect the active widget and ignore it in case it's a switch?
|
||||
// data->key = LV_KEY_UP;
|
||||
// data->state = LV_INDEV_STATE_PRESSED;
|
||||
} else if (i == '.') { // Down
|
||||
data->key = LV_KEY_DOWN;
|
||||
data->state = LV_INDEV_STATE_PRESSED;
|
||||
/*
|
||||
* WARNING:
|
||||
* lv_switch picks up on this and toggles it, while the CardputerEncoder uses it for scrolling.
|
||||
* We disable the keypress so the encoder can work properly.
|
||||
*/
|
||||
// TODO: Can we detect the active widget and ignore it in case it's a switch?
|
||||
// data->key = LV_KEY_DOWN;
|
||||
// data->state = LV_INDEV_STATE_PRESSED;
|
||||
} else if (i == ',') { // Left
|
||||
data->key = LV_KEY_LEFT;
|
||||
data->state = LV_INDEV_STATE_PRESSED;
|
||||
|
||||
Reference in New Issue
Block a user