feat: popup menu ignore initial mouse state

Author: std-microblock

src/shell/contextmenu/menu_widget.cc

@@ -705,7 +705,8 @@ BOOL IsCursorVisible() {
 
 mb_shell::mouse_menu_widget_main::mouse_menu_widget_main(menu menu_data,
                                                          float x, float y)
-    : widget(), anchor_x(x), anchor_y(y) {
+    : widget(), anchor_x(x), anchor_y(y),
+      ignore_outside_click_until_mouse_release(true) {
     menu_wid = std::make_shared<menu_widget>(true);
     menu_wid->init_from_data(menu_data);
 
@@ -731,14 +732,20 @@ void mb_shell::mouse_menu_widget_main::update(ui::update_context &ctx) {
     menu_wid->update(ctx);
 
     auto using_touchscreen = !IsCursorVisible();
+    auto has_pressed_mouse_button = (GetAsyncKeyState(VK_LBUTTON) & 0x8000) ||
+                                    (GetAsyncKeyState(VK_RBUTTON) & 0x8000);
+
+    if (ignore_outside_click_until_mouse_release && !has_pressed_mouse_button) {
+        ignore_outside_click_until_mouse_release = false;
+    }
 
     if (ctx.hovered_widgets->empty()) {
         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) {
+        if (!ignore_outside_click_until_mouse_release &&
+            ((ctx.mouse_clicked || ctx.right_mouse_clicked) ||
+             has_pressed_mouse_button)) {
             ctx.rt.hide_as_close();
         }
     } else {

src/shell/contextmenu/menu_widget.h

@@ -156,6 +156,7 @@ struct mouse_menu_widget_main : public ui::widget {
     float anchor_x = 0, anchor_y = 0;
     mouse_menu_widget_main(menu menu_data, float x, float y);
     bool position_calibrated = false, direction_calibrated = false;
+    bool ignore_outside_click_until_mouse_release = false;
     popup_direction direction;
     std::shared_ptr<menu_widget> menu_wid;
 

src/shell/script/binding_types.cc

@@ -1796,26 +1796,26 @@ void menu_controller::show_at(int x, int y) {
     if (!valid() || !$menu_detached)
         return;
 
-    std::promise<void> prom;
-    auto fut = prom.get_future();
-    std::thread([x, y, this, &prom]() mutable {
-        std::ignore = mb_shell::track_popup_menu(
-            menu{
-                .is_top_level = true,
-            },
-            x, y,
-            [this, &prom](menu_render &render) {
-                auto menu_new =
-                    render.rt->root->get_child<mouse_menu_widget_main>()
-                        ->menu_wid;
-                menu_new->children = $menu_detached->children;
-                menu_new->children = $menu_detached->children;
-                $menu = menu_new;
-                $menu_detached = nullptr;
-                prom.set_value();
-            },
-            false);
-    }).detach();
+    std::promise<void> prom;
+    auto fut = prom.get_future();
+    std::thread([x, y, this, &prom]() mutable {
+        std::ignore = mb_shell::track_popup_menu(
+            menu{
+                .is_top_level = true,
+            },
+            x, y,
+            [this, &prom](menu_render &render) {
+                auto menu_new =
+                    render.rt->root->get_child<mouse_menu_widget_main>()
+                        ->menu_wid;
+                menu_new->children = $menu_detached->children;
+                menu_new->children = $menu_detached->children;
+                $menu = menu_new;
+                $menu_detached = nullptr;
+                prom.set_value();
+            },
+            false);
+    }).detach();
     fut.wait();
 }
 void menu_controller::show_at_cursor() {