Keyboard improvements (#240)

- Renamed various keyboard functions so it's easier to differentiate hardware versus software keyboard functionality
- Created `Tactility/lvgl/Keyboard.h` as a proxy  for the internal `Gui` service.
- Implemented `tt_lvgl_keyboard.h` in `TactilityC`.
This commit is contained in:
Ken Van Hoeylandt
2025-03-10 00:21:49 +01:00
committed by GitHub
parent 13d7e84ef3
commit 85a6ad3bbe
14 changed files with 274 additions and 130 deletions
+10 -10
View File
@@ -1,7 +1,7 @@
#include "Tactility/lvgl/Keyboard.h"
#include "Tactility/Check.h"
#include "Tactility/service/gui/Gui_i.h"
#include "Tactility/lvgl/LvglKeypad.h"
#include "Tactility/lvgl/LvglSync.h"
#include "Tactility/service/gui/Gui.h"
#include <Tactility/TactilityConfig.h>
@@ -11,19 +11,19 @@ extern Gui* gui;
static void show_keyboard(lv_event_t* event) {
lv_obj_t* target = lv_event_get_current_target_obj(event);
keyboardShow(target);
softwareKeyboardShow(target);
lv_obj_scroll_to_view(target, LV_ANIM_ON);
}
static void hide_keyboard(TT_UNUSED lv_event_t* event) {
keyboardHide();
softwareKeyboardHide();
}
bool keyboardIsEnabled() {
return !lvgl::keypad_is_available() || TT_CONFIG_FORCE_ONSCREEN_KEYBOARD;
bool softwareKeyboardIsEnabled() {
return !lvgl::hardware_keyboard_is_available() || TT_CONFIG_FORCE_ONSCREEN_KEYBOARD;
}
void keyboardShow(lv_obj_t* textarea) {
void softwareKeyboardShow(lv_obj_t* textarea) {
lock();
if (gui->keyboard) {
@@ -34,7 +34,7 @@ void keyboardShow(lv_obj_t* textarea) {
unlock();
}
void keyboardHide() {
void softwareKeyboardHide() {
lock();
if (gui->keyboard) {
@@ -48,7 +48,7 @@ void keyboardAddTextArea(lv_obj_t* textarea) {
lock();
tt_check(lvgl::lock(0), "lvgl should already be locked before calling this method");
if (keyboardIsEnabled()) {
if (softwareKeyboardIsEnabled()) {
lv_obj_add_event_cb(textarea, show_keyboard, LV_EVENT_FOCUSED, nullptr);
lv_obj_add_event_cb(textarea, hide_keyboard, LV_EVENT_DEFOCUSED, nullptr);
lv_obj_add_event_cb(textarea, hide_keyboard, LV_EVENT_READY, nullptr);
@@ -57,7 +57,7 @@ void keyboardAddTextArea(lv_obj_t* textarea) {
// lv_obj_t auto-remove themselves from the group when they are destroyed (last checked in LVGL 8.3)
lv_group_add_obj(gui->keyboardGroup, textarea);
lvgl::keypad_activate(gui->keyboardGroup);
lvgl::software_keyboard_activate(gui->keyboardGroup);
lvgl::unlock();
unlock();