[fix] popup self-destroy

Author: mrsrina

include/ekg/core/pools.hpp

@@ -307,8 +307,10 @@ namespace ekg {
           true,
           {
             property.is_childnizate = true;
+            property.is_stack_top_level = true;
             property.is_children_docknizable = true;
             property.states.is_visible = false;
+
             widget.color_scheme = global_theme.popup_color_scheme;
           }
         );

include/ekg/ui/popup/popup.hpp

@@ -37,6 +37,7 @@ namespace ekg {
       ekg::at_t popup_opened_at {ekg::at_t::not_found};
       bool was_visible {};
       bool just_opened {};
+      bool should_self_recursive_destroy {};
     };
 
     struct link_t {

include/ekg/ui/property.hpp

@@ -81,6 +81,8 @@ namespace ekg {
 
     bool is_childnizate {};
     bool is_children_docknizable {};
+    bool is_stack_top_level {};
+
     std::vector<ekg::at_t> children {};
   public:
     ekg::property_t::states_t states {};

src/core/runtime.cpp

@@ -42,6 +42,8 @@ void ekg::core::swap_collector(
 
   if (
     parent_property.at == ekg::gui.bind.swap_at
+    ||
+    parent_property.is_stack_top_level
   ) {
     was_found = true;
   }
@@ -88,7 +90,7 @@ void ekg::core::swap(ekg::info_t &info) {
     ekg::p_core->collector.clear();
     ekg::core::swap_collector(was_found, at);
 
-    if (ekg::p_core->top_level_stack.empty() && was_found) {
+    if (was_found) {
       ekg::p_core->top_level_stack.insert(
         ekg::p_core->top_level_stack.begin(),
         ekg::p_core->collector.begin(),

src/ekg.cpp

@@ -136,6 +136,8 @@ void ekg::render() {
   }
 
   if (ekg::gui.ui.redraw) {
+    ekg::gui.ui.redraw = false;
+    
     ekg::p_core->draw_allocator.invoke();
 
     for (ekg::at_t &at : ekg::p_core->stack) {
@@ -185,6 +187,5 @@ void ekg::render() {
     ekg::p_core->draw_allocator.revoke();
   }
 
-  ekg::gui.ui.redraw = false;
   ekg::p_core->draw_allocator.to_gpu();
 }

src/ui/popup/popup.cpp

@@ -48,7 +48,7 @@ void ekg::show(
   );
 
   ekg::io::dispatch(
-    ekg::io::operation::high_frequency,
+    ekg::io::operation::swap,
     popup.property_at
   );
 }

src/ui/popup/widget.cpp

@@ -30,14 +30,18 @@
 void ekg::ui::recursive_self_destroy_abs_popup(
   ekg::popup_t &popup
 ) {
-  if (popup.parent_popup_at == ekg::at_t::not_found) {
-    ekg::ui::recursive_children_set_visible(
-      popup,
-      false
-    );
+  if (popup == ekg::popup_t::not_found) {
     return;
   }
 
+  ekg::property_t &property {ekg::query<ekg::property_t>(popup.property_at)};
+  ekg::ui::set_visible(
+    property,
+    false
+  );
+
+  property.widget.should_buffering = false;
+
   ekg::ui::recursive_self_destroy_abs_popup(
     ekg::query<ekg::popup_t>(popup.parent_popup_at)
   );
@@ -99,10 +103,19 @@ void ekg::ui::splash_popup_just_opened(
   const ekg::vec2_t<float> &pos
 ) {
   ekg::property_t &property {ekg::query<ekg::property_t>(popup.property_at)};
-  if (popup == ekg::popup_t::not_found || property == ekg::property_t::not_found) {
+  if (
+    popup == ekg::popup_t::not_found
+    ||
+    property == ekg::property_t::not_found
+  ) {
     return;
   }
 
+  ekg::ui::recursive_children_set_visible(
+    popup,
+    false
+  );
+
   property.states.is_visible = true;
   popup.widget.was_visible = true;
   ekg::gui.ui.redraw = true;
@@ -174,11 +187,13 @@ void ekg::ui::event(
       ekg::input_info_t &input {ekg::p_core->handler_input.input};
       ekg::vec2_t<float> interact {static_cast<ekg::vec2_t<float>>(input.interact)};
 
+      bool skip_this_tick_self_destruction {};
       if (
         popup.widget.just_opened
         &&
         input.was_released
       ) {
+        skip_this_tick_self_destruction = true;
         popup.widget.just_opened = false;
       }
 
@@ -204,7 +219,6 @@ void ekg::ui::event(
       bool should_unset_visibility {};
       bool is_linked_hovering {};
       bool is_this_popup_being_hovered {};
-      bool should_self_recursive_destroy {};
       bool is_hovering_any_linked_widget {};
 
       ekg::rect_t<float> rect_position {};
@@ -354,34 +368,26 @@ void ekg::ui::event(
         );
       }
 
-      should_self_recursive_destroy = (
-        (
-          input.was_released
-          &&
-          is_this_popup_being_hovered
-          &&
-          popup.links.empty()
-        )
-        ||
-        (
-          input.was_released
-          &&
-          is_this_popup_being_hovered
-          &&
-          !is_hovering_any_linked_widget
-        )
-        ||
+      if (
         (
-          input.was_pressed
-          &&
-          !is_hovering_a_popup
+          (
+            input.was_released
+            &&
+            is_this_popup_being_hovered
+            &&
+            !is_hovering_any_linked_widget
+          )
+          ||
+          (
+            input.was_released
+            &&
+            !is_hovering_a_popup
+          )
         )
-      );
-
-      if (should_self_recursive_destroy) {
-        ekg::ui::recursive_self_destroy_abs_popup(
-          popup
-        );
+        &&
+        !skip_this_tick_self_destruction
+      ) {
+        popup.widget.should_self_recursive_destroy = true;
       }
 
       break;
@@ -403,6 +409,14 @@ void ekg::ui::pass(
   ekg::property_t &property,
   ekg::popup_t &popup
 )  {
+  if (popup.widget.should_self_recursive_destroy) {
+    ekg::ui::recursive_self_destroy_abs_popup(
+      popup
+    );
+
+    popup.widget.should_self_recursive_destroy = false;
+  }
+
   ekg::ui::pass(property, popup.widget.frame);
 }