From 0c00af71be9f8dff448279b0fc0831c0fdc8c72b Mon Sep 17 00:00:00 2001
From: Johannes Marbach <n0-0ne+gitlab@mailbox.org>
Date: Fri, 28 Jan 2022 19:58:57 +0100
Subject: [PATCH] Update submodules, fix LVGL keyboard coloring

---
 CHANGELOG.md         |  1 +
 find-lvgl-sources.sh | 12 ++++++++++--
 lv_drivers           |  2 +-
 lvgl                 |  2 +-
 squeek2lvgl          |  2 +-
 theme.c              |  2 +-
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 847ad4e..c01aa49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - feat!: Hide partition name (#27)
 - fix: Prevent scrolling when keyboard hides (#21)
 - feat!: Do not show last typed character when typing (#25)
+- feat: Update lvgl & lv_drivers to git master (2022-02-21)
 
 ## 0.1.0 (2021-11-15)
 
diff --git a/find-lvgl-sources.sh b/find-lvgl-sources.sh
index 3458a6b..ad0ae32 100755
--- a/find-lvgl-sources.sh
+++ b/find-lvgl-sources.sh
@@ -20,8 +20,10 @@
 
 find "$1" -name "*.mk" | while IFS= read -r makefile; do
     grep "^CSRCS\s*+=" "$makefile" | sed "s|.*=\s*||g" | while read -r expr; do
+        dir=$(dirname "$makefile")
+
         # Ignore example code
-        if [[ $(dirname $makefile) =~ .*/examples ]]; then
+        if [ "${dir%examples}" != "$dir" ]; then
             continue
         fi
 
@@ -32,9 +34,15 @@ find "$1" -name "*.mk" | while IFS= read -r makefile; do
                 | sed 's|$(LVGL_DIR_NAME)/|lvgl/|g' \
                 | sed 's|$(LV_DRIVERS_DIR_NAME)/|lv_drivers/|g')
         else
-            expr="$(dirname $makefile)/$expr"
+            expr="$dir/$expr"
         fi
 
+        # Map erroneous(?) paths
+        expr=$(echo "$expr" | sed 's|gpu/lv_gpu_nxp_pxp.c|draw/nxp_pxp/lv_gpu_nxp_pxp.c|g')
+        expr=$(echo "$expr" | sed 's|gpu/lv_gpu_nxp_pxp_osa.c|draw/nxp_pxp/lv_gpu_nxp_pxp_osa.c|g')
+        expr=$(echo "$expr" | sed 's|gpu/lv_gpu_nxp_vglite.c|draw/nxp_vglite/lv_gpu_nxp_vglite.c|g')
+        expr=$(echo "$expr" | sed 's|gpu/lv_gpu_stm32_dma2d.c|draw/stm32_dma2d/lv_gpu_stm32_dma2d.c|g')
+
         # Resolve $(wildcard ...)
         expr=$(echo "$expr" | sed 's|$(wildcard\s*\(.*\))|\1|g')
 
diff --git a/lv_drivers b/lv_drivers
index 97e500b..1bd4368 160000
--- a/lv_drivers
+++ b/lv_drivers
@@ -1 +1 @@
-Subproject commit 97e500b200ad6e947c0b62940929f30bc8f5ef4e
+Subproject commit 1bd4368e71df5cafd68d1ad0a37ce0f92b8f6b88
diff --git a/lvgl b/lvgl
index bd19083..efb9c5c 160000
--- a/lvgl
+++ b/lvgl
@@ -1 +1 @@
-Subproject commit bd19083aedd42b8f60605d2c5773719a6ccc3426
+Subproject commit efb9c5cc52521b100b08306408f59012632df6ae
diff --git a/squeek2lvgl b/squeek2lvgl
index db4222c..e3ce01b 160000
--- a/squeek2lvgl
+++ b/squeek2lvgl
@@ -1 +1 @@
-Subproject commit db4222c091a2b5584cb952324f26e97ecc938de8
+Subproject commit e3ce01bc38020b21bc61844fa1fed1a4f41097c5
diff --git a/theme.c b/theme.c
index b8ca245..237c72d 100644
--- a/theme.c
+++ b/theme.c
@@ -306,7 +306,7 @@ static void keyboard_draw_part_begin_cb(lv_event_t *event) {
         key = &(current_theme.keyboard.keys.key_char);
     }
 
-    bool pressed = lv_btnmatrix_get_selected_btn(obj) == dsc->id;
+    bool pressed = lv_btnmatrix_get_selected_btn(obj) == dsc->id && lv_obj_has_state(btnm, LV_STATE_PRESSED);
 
     dsc->label_dsc->color = lv_color_hex((pressed ? key->pressed : key->normal).fg_color);
     dsc->rect_dsc->bg_color = lv_color_hex((pressed ? key->pressed : key->normal).bg_color);