jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-26 04:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make show/hide pointer effective immediately

Browse Source
This commit is contained in:
fvanroie 2021-11-06 05:24:22 +01:00
parent a566482a8b
commit 8f9342be32
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/hasp_gui.cpp
View File

@ -68,6 +68,7 @@ gui_conf_t gui_settings = {.show_pointer = false,
.rotation = TFT_ROTATION, .rotation = TFT_ROTATION,
.invert_display = INVERT_COLORS, .invert_display = INVERT_COLORS,
.cal_data = {0, 65535, 0, 65535, 0}}; .cal_data = {0, 65535, 0, 65535, 0}};
lv_obj_t* cursor;
uint16_t tft_width = TFT_WIDTH; uint16_t tft_width = TFT_WIDTH;
uint16_t tft_height = TFT_HEIGHT; uint16_t tft_height = TFT_HEIGHT;
@ -86,6 +87,11 @@ uint16_t tft_height = TFT_HEIGHT;
// lv_tick_inc(LVGL_TICK_PERIOD); // lv_tick_inc(LVGL_TICK_PERIOD);
// } // }
void gui_hide_pointer(bool hidden)
{
if(cursor) lv_obj_set_hidden(cursor, hidden || !gui_settings.show_pointer);
}
IRAM_ATTR void gui_flush_cb(lv_disp_drv_t* disp, const lv_area_t* area, lv_color_t* color_p) IRAM_ATTR void gui_flush_cb(lv_disp_drv_t* disp, const lv_area_t* area, lv_color_t* color_p)
{ {
haspTft.flush_pixels(disp, area, color_p); haspTft.flush_pixels(disp, area, color_p);
@ -330,28 +336,22 @@ void guiSetup()
mouse_indev->driver.type = LV_INDEV_TYPE_POINTER; mouse_indev->driver.type = LV_INDEV_TYPE_POINTER;
/*Set a cursor for the mouse*/ /*Set a cursor for the mouse*/
if(gui_settings.show_pointer) { LOG_TRACE(TAG_GUI, F("Initialize Cursor"));
// lv_obj_t * label = lv_label_create(lv_layer_sys(), NULL); lv_obj_t* mouse_layer = lv_disp_get_layer_sys(NULL); // default display
// lv_label_set_text(label, "<");
// lv_indev_set_cursor(mouse_indev, label); // connect the object to the driver
LOG_TRACE(TAG_GUI, F("Initialize Cursor"));
lv_obj_t* cursor;
lv_obj_t* mouse_layer = lv_disp_get_layer_sys(NULL); // default display
#if defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP32)
LV_IMG_DECLARE(mouse_cursor_icon); /*Declare the image file.*/ LV_IMG_DECLARE(mouse_cursor_icon); /*Declare the image file.*/
cursor = lv_img_create(mouse_layer, NULL); /*Create an image object for the cursor */ cursor = lv_img_create(mouse_layer, NULL); /*Create an image object for the cursor */
lv_img_set_src(cursor, &mouse_cursor_icon); /*Set the image source*/ lv_img_set_src(cursor, &mouse_cursor_icon); /*Set the image source*/
#else #else
cursor = lv_obj_create(mouse_layer, NULL); // show cursor object on every page cursor = lv_obj_create(mouse_layer, NULL); // show cursor object on every page
lv_obj_set_size(cursor, 9, 9); lv_obj_set_size(cursor, 9, 9);
lv_obj_set_style_local_radius(cursor, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_RADIUS_CIRCLE); lv_obj_set_style_local_radius(cursor, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_RADIUS_CIRCLE);
lv_obj_set_style_local_bg_color(cursor, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_RED); lv_obj_set_style_local_bg_color(cursor, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_RED);
lv_obj_set_style_local_bg_opa(cursor, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_COVER); lv_obj_set_style_local_bg_opa(cursor, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_COVER);
#endif #endif
lv_indev_set_cursor(mouse_indev, cursor); /*Connect the image object to the driver*/ gui_hide_pointer(false);
} lv_indev_set_cursor(mouse_indev, cursor); /*Connect the image object to the driver*/
#if !(defined(WINDOWS) || defined(POSIX)) #if !(defined(WINDOWS) || defined(POSIX))
// drv_touch_init(gui_settings.rotation); // Touch driver // drv_touch_init(gui_settings.rotation); // Touch driver
@ -517,6 +517,7 @@ bool guiSetConfig(const JsonObject& settings)
changed |= gui_settings.show_pointer != settings[FPSTR(FP_GUI_POINTER)].as<bool>(); changed |= gui_settings.show_pointer != settings[FPSTR(FP_GUI_POINTER)].as<bool>();
gui_settings.show_pointer = settings[FPSTR(FP_GUI_POINTER)].as<bool>(); gui_settings.show_pointer = settings[FPSTR(FP_GUI_POINTER)].as<bool>();
gui_hide_pointer(false);
} }
if(!settings[FPSTR(FP_GUI_CALIBRATION)].isNull()) { if(!settings[FPSTR(FP_GUI_CALIBRATION)].isNull()) {

1
src/hasp_gui.h
View File

@ -22,6 +22,7 @@ IRAM_ATTR void guiLoop(void);
void guiEverySecond(void); void guiEverySecond(void);
void guiStart(void); void guiStart(void);
void guiStop(void); void guiStop(void);
void gui_hide_pointer(bool hidden);
/* ===== Special Event Processors ===== */ /* ===== Special Event Processors ===== */
void guiCalibrate(void); void guiCalibrate(void);