feat(ui): hittest

Author: std-microblock

src/shell/contextmenu/menu_widget.cc

@@ -210,15 +210,12 @@ void mb_shell::menu_widget::update(ui::update_context &ctx) {
   bg->update(ctx);
 
   ctx.mouse_clicked_on_hit(bg.get());
+  ctx.hovered_hit(bg.get());
 }
 void mb_shell::menu_widget::render(ui::nanovg_context ctx) {
   std::lock_guard lock(data_lock);
   bg->render(ctx);
   super::render(ctx);
-
-  if (have_overlap) {
-    std::println("Overlap detected");
-  }
 }
 void mb_shell::menu_item_widget::reset_appear_animation(float delay) {
   this->opacity->after_animate = [this](float dest) {
@@ -267,7 +264,7 @@ void mb_shell::mouse_menu_widget_main::update(ui::update_context &ctx) {
 
   menu_wid->update(ctx);
 
-  if (!ctx.hovered(menu_wid.get())) {
+  if (!ctx.hovered(menu_wid.get(), false)) {
     glfwSetWindowAttrib(ctx.rt.window, GLFW_MOUSE_PASSTHROUGH, GLFW_TRUE);
     if ((ctx.mouse_clicked || ctx.right_mouse_clicked) ||
         GetAsyncKeyState(VK_LBUTTON) & 0x8000 ||

src/ui/widget.cc

@@ -38,7 +38,10 @@ void ui::widget::update(update_context &ctx) {
     anim->update(ctx.delta_t);
   }
 }
-bool ui::update_context::hovered(widget *w) const {
+bool ui::update_context::hovered(widget *w, bool hittest) const {
+  if (hittest && !hovered_widgets.empty())
+    return false;
+
   return w->check_hit(*this);
 }
 float ui::widget::measure_height(update_context &ctx) { return height->dest(); }
@@ -87,10 +90,14 @@ void ui::widget_parent_flex::update(update_context &ctx) {
 void ui::update_context::set_hit_hovered(widget *w) {
   hovered_widgets.push_back(w->shared_from_this());
 }
-bool ui::update_context::mouse_clicked_on(widget *w) const {
+bool ui::update_context::mouse_clicked_on(widget *w, bool hittest) const {
+  if (hittest && !clicked_widgets.empty())
+    return false;
   return mouse_clicked && hovered(w);
 }
-bool ui::update_context::mouse_down_on(widget *w) const {
+bool ui::update_context::mouse_down_on(widget *w, bool hittest) const {
+  if (hittest && !hovered_widgets.empty())
+    return false;
   return mouse_down && hovered(w);
 }
 void ui::update_context::set_hit_clicked(widget *w) {
@@ -117,6 +124,4 @@ bool ui::widget::check_hit(const update_context &ctx) {
          ctx.mouse_y >= (y->dest() + ctx.offset_y) &&
          ctx.mouse_y <= (y->dest() + height->dest() + ctx.offset_y);
 }
-void ui::widget::render(nanovg_context ctx) {
-
-}
+void ui::widget::render(nanovg_context ctx) {}

src/ui/widget.h

@@ -31,9 +31,9 @@ struct update_context {
   void set_hit_hovered(widget *w);
   void set_hit_clicked(widget *w);
 
-  bool hovered(widget *w) const;
-  bool mouse_clicked_on(widget *w) const;
-  bool mouse_down_on(widget *w) const;
+  bool hovered(widget *w, bool hittest = true) const;
+  bool mouse_clicked_on(widget *w, bool hittest = true) const;
+  bool mouse_down_on(widget *w, bool hittest = true) const;
 
   bool mouse_clicked_on_hit(widget *w);
   bool hovered_hit(widget *w);