From 7ddba250a462fe3706f73ac5c28dd413e8b3d1b1 Mon Sep 17 00:00:00 2001 From: philmoz Date: Fri, 18 Apr 2025 18:16:51 +1000 Subject: [PATCH] fix(color): QR code blocks touch events (#6104) Co-authored-by: philmoz --- radio/src/gui/colorlcd/libui/static.cpp | 1 + radio/src/lua/api_colorlcd_lvgl.cpp | 1 + radio/src/lua/lua_lvgl_widget.cpp | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/colorlcd/libui/static.cpp b/radio/src/gui/colorlcd/libui/static.cpp index 74838d2b7..9a41b0c3a 100644 --- a/radio/src/gui/colorlcd/libui/static.cpp +++ b/radio/src/gui/colorlcd/libui/static.cpp @@ -365,4 +365,5 @@ QRCode::QRCode(Window *parent, coord_t x, coord_t y, coord_t sz, std::string dat { auto qr = lv_qrcode_create(lvobj, sz, makeLvColor(color), makeLvColor(bgColor)); lv_qrcode_update(qr, data.c_str(), data.length()); + lv_obj_clear_flag(lvobj, LV_OBJ_FLAG_CLICKABLE); } diff --git a/radio/src/lua/api_colorlcd_lvgl.cpp b/radio/src/lua/api_colorlcd_lvgl.cpp index f43870065..f38b0cc09 100644 --- a/radio/src/lua/api_colorlcd_lvgl.cpp +++ b/radio/src/lua/api_colorlcd_lvgl.cpp @@ -382,6 +382,7 @@ LROT_BEGIN(lvgllib, NULL, 0) LROT_NUMENTRY(PAD_SMALL, PAD_SMALL) LROT_NUMENTRY(PAD_MEDIUM, PAD_MEDIUM) LROT_NUMENTRY(PAD_LARGE, PAD_LARGE) + LROT_NUMENTRY(PAD_OUTLINE, PAD_OUTLINE) LROT_NUMENTRY(SRC_ALL, 0xFFFFFFFF) LROT_NUMENTRY(SRC_INPUT, SRC_INPUT) LROT_NUMENTRY(SRC_LUA, SRC_LUA) diff --git a/radio/src/lua/lua_lvgl_widget.cpp b/radio/src/lua/lua_lvgl_widget.cpp index b5d9a0fcb..70b6b15d9 100644 --- a/radio/src/lua/lua_lvgl_widget.cpp +++ b/radio/src/lua/lua_lvgl_widget.cpp @@ -1238,7 +1238,7 @@ void LvglWidgetSetting::build(lua_State *L) { window = new Window(lvglManager->getCurrentParent(), {x, y, w, h}, lv_obj_create); - window->padAll(PAD_TINY); + window->padAll(PAD_OUTLINE); auto lbl = lv_label_create(window->getLvObj()); lv_obj_align(lbl, LV_ALIGN_LEFT_MID, 0, 0); etx_txt_color(lbl, COLOR_THEME_PRIMARY1_INDEX);