fix(shell): improve touchscreen support

Author: std-microblock

src/shell/contextmenu/menu_render.cc

@@ -94,6 +94,7 @@ menu_render menu_render::create(int x, int y, menu menu) {
 
   rt->on_focus_changed = [](bool focused) {
     if (!focused) {
+      rt->hide_as_close();
     }
   };
 

src/shell/contextmenu/menu_widget.cc

@@ -79,7 +79,8 @@ void mb_shell::menu_item_normal_widget::render(ui::nanovg_context ctx) {
     }
 
     auto paintY = floor(*y + (*height - icon_width) / 2);
-    auto paintX = *x + padding + width->dest() - right_icon_padding - icon_width;
+    auto paintX =
+        *x + padding + width->dest() - right_icon_padding - icon_width;
     auto paint2 = ctx.imagePattern(paintX, paintY, icon_width, icon_width, 0,
                                    icon_unfold_img->id, *opacity / 255.f);
     ctx.beginPath();
@@ -367,6 +368,15 @@ void mb_shell::menu_item_normal_widget::reset_appear_animation(float delay) {
 
   this->x->animate_to(0);
 }
+
+BOOL IsCursorVisible() {
+  CURSORINFO ci = {sizeof(CURSORINFO)};
+  if (GetCursorInfo(&ci)) {
+    return (ci.flags & CURSOR_SHOWING) != 0;
+  }
+  return FALSE;
+}
+
 mb_shell::mouse_menu_widget_main::mouse_menu_widget_main(menu menu_data,
                                                          float x, float y)
     : widget(), anchor_x(x), anchor_y(y) {
@@ -392,8 +402,12 @@ void mb_shell::mouse_menu_widget_main::update(ui::update_context &ctx) {
   }
   menu_wid->update(ctx);
 
+  auto using_touchscreen = !IsCursorVisible();
+
   if (ctx.hovered_widgets->empty()) {
-    glfwSetWindowAttrib(ctx.rt.window, GLFW_MOUSE_PASSTHROUGH, GLFW_TRUE);
+    glfwSetWindowAttrib(ctx.rt.window, GLFW_MOUSE_PASSTHROUGH,
+                        using_touchscreen ? GLFW_FALSE : GLFW_TRUE);
+                        
     if ((ctx.mouse_clicked || ctx.right_mouse_clicked) ||
         GetAsyncKeyState(VK_LBUTTON) & 0x8000 ||
         GetAsyncKeyState(VK_RBUTTON) & 0x8000) {
@@ -766,7 +780,7 @@ void mb_shell::menu_item_ownerdraw_widget::update(ui::update_context &ctx) {
 void mb_shell::menu_item_ownerdraw_widget::render(ui::nanovg_context ctx) {
   if (!img)
     img = ui::LoadBitmapImage(ctx, owner_draw.bitmap);
-  
+
   auto paint = ctx.imagePattern(*x, y->dest(), owner_draw.width,
                                 owner_draw.height, 0, img->id, 1);
 

src/shell/script/quickjspp.cc

@@ -1,25 +1,26 @@
 #include "quickjspp.hpp"
+#include <print>
 
 namespace qjs {
 thread_local Context *Context::current;
 void wait_with_msgloop(std::function<void()> f) {
-    auto this_thread = GetCurrentThreadId();
-    bool completed_flag = false;
-    auto thread_wait = std::thread([=, &completed_flag]() {
-        f();
-        completed_flag = true;
-        PostThreadMessageW(this_thread, WM_NULL, 0, 0);
-    });
+  auto this_thread = GetCurrentThreadId();
+  bool completed_flag = false;
+  auto thread_wait = std::thread([=, &completed_flag]() {
+    f();
+    completed_flag = true;
+    PostThreadMessageW(this_thread, WM_NULL, 0, 0);
+  });
 
-    MSG msg;
-     while (GetMessageW(&msg, nullptr, 0, 0)) {
-        TranslateMessage(&msg);
-        DispatchMessageW(&msg);
+  MSG msg;
+  while (GetMessageW(&msg, nullptr, 0, 0)) {
+    TranslateMessage(&msg);
+    DispatchMessageW(&msg);
 
-        if (completed_flag) {
-            break;
-        }
+    if (completed_flag) {
+      break;
     }
-    thread_wait.join();
+  }
+  thread_wait.join();
 }
 } // namespace qjs