[update] added sensitive state for widgets-inside popup

Author: mrsrina

include/ekg/core/pools.hpp

@@ -87,7 +87,7 @@ namespace ekg::core {
     ekg_core_widget_call_impl(descriptor_t, widget_descriptor_at, todo); \
   }
 
-#define ekg_registry_widget(widget_descriptor_t, register_widget_pool, register_property_pool, is_container, register_settings) \
+#define ekg_registry_widget_impl(widget_descriptor_t, register_widget_pool, register_property_pool, is_container, register_settings) \
   widget_descriptor_t &widget { \
     register_widget_pool.push_back( \
       ekg::io::any_static_cast<widget_descriptor_t>(&descriptor) \
@@ -115,13 +115,13 @@ namespace ekg::core {
   ekg::property_t &parent {ekg::query<ekg::property_t>(ekg::gui.bind.parent_at)}; \
   if (is_container) { \
     if (parent != ekg::property_t::not_found && widget.dock != ekg::dock::none) { \
+      property.parent_at = parent.at; \
       parent.children.push_back(widget.at); \
-      property.parent_at = ekg::gui.bind.parent_at; \
       property.abs_parent_at = parent.abs_parent_at; \
-    } else { \
-      ekg::gui.bind.parent_at = property.at; \
+    } else if (parent == ekg::property_t::not_found) { \
       property.abs_parent_at = property.at; \
     } \
+    ekg::gui.bind.parent_at = property.at; \
   } else if (parent != ekg::property_t::not_found) { \
     property.parent_at = ekg::gui.bind.parent_at; \
     property.abs_parent_at = parent.abs_parent_at; \
@@ -236,7 +236,7 @@ namespace ekg {
   ) {
     switch (t::type) {
       case ekg::type::frame: {
-        ekg_registry_widget(
+        ekg_registry_widget_impl(
           ekg::frame_t,
           ekg::pools.frame,
           ekg::pools.frame_property,
@@ -250,7 +250,7 @@ namespace ekg {
       }
 
       case ekg::type::button: {
-        ekg_registry_widget(
+        ekg_registry_widget_impl(
           ekg::button_t,
           ekg::pools.button,
           ekg::pools.button_property,
@@ -264,7 +264,7 @@ namespace ekg {
       }
 
       case ekg::type::label: {
-        ekg_registry_widget(
+        ekg_registry_widget_impl(
           ekg::label_t,
           ekg::pools.label,
           ekg::pools.label_property,
@@ -278,7 +278,7 @@ namespace ekg {
       }
 
       case ekg::type::scrollbar: {
-        ekg_registry_widget(
+        ekg_registry_widget_impl(
           ekg::scrollbar_t,
           ekg::pools.scrollbar,
           ekg::pools.scrollbar_property,
@@ -292,7 +292,7 @@ namespace ekg {
       }
 
       case ekg::type::slider: {
-        ekg_registry_widget(
+        ekg_registry_widget_impl(
           ekg::slider_t,
           ekg::pools.slider,
           ekg::pools.slider_property,
@@ -306,7 +306,7 @@ namespace ekg {
       }
 
       case ekg::type::popup: {
-        ekg_registry_widget(
+        ekg_registry_widget_impl(
           ekg::popup_t,
           ekg::pools.popup,
           ekg::pools.popup_property,
@@ -359,13 +359,13 @@ namespace ekg {
       ekg::gui.bind.stack_at = ekg::at_t::not_found;
       break;
     case ekg::type::property:
-      ekg::gui.bind.parent_at = ekg::at_t::not_found;
+      ekg::gui.bind.parent_at = ekg::query<ekg::property_t>(ekg::gui.bind.parent_at).parent_at;
       break;
     case ekg::type::frame:
-      ekg::gui.bind.parent_at = ekg::at_t::not_found;
+      ekg::gui.bind.parent_at = ekg::query<ekg::property_t>(ekg::gui.bind.parent_at).parent_at;
       break;
     case ekg::type::popup:
-      ekg::gui.bind.parent_at = ekg::at_t::not_found;
+      ekg::gui.bind.parent_at = ekg::query<ekg::property_t>(ekg::gui.bind.parent_at).parent_at;
       break;
     }
   }

include/ekg/ui/frame/frame.hpp

@@ -64,7 +64,7 @@ namespace ekg {
     ekg::at_t property_at {};
   public:
     std::string tag {};
-    ekg::dock dock {ekg::dock::none};
+    ekg::flags_t dock {ekg::dock::none};
     ekg::rect_t<float> rect {20.0f, 20.0f, 150.0f, 200.0f};
     ekg::flags_t drag {ekg::dock::top};
     ekg::flags_t resize {};

include/ekg/ui/property.hpp

@@ -41,6 +41,7 @@ namespace ekg {
       bool is_highlight {};
       bool is_focused {};
       bool is_warning {};
+      bool is_sensitive {};
     };
 
     struct operation_t {

src/ui/button/widget.cpp

@@ -201,6 +201,7 @@ void ekg::ui::event(
           );
 
           if (!is_checkbox) {
+            property.states.is_sensitive = true;
             check.value.set(true);
           }
         }
@@ -227,6 +228,7 @@ void ekg::ui::event(
           );
 
           if (!is_checkbox) {
+            property.states.is_sensitive = false;
             check.value.set(false);
           }
 

src/ui/frame/widget.cpp

@@ -282,6 +282,7 @@ void ekg::ui::event(
         frame.widget.target_dock_resize = ekg::dock::none;
         frame.widget.target_dock_drag = ekg::dock::none;
         property.states.is_active = false;
+        property.states.is_absolute = false;
       }
 
       break;

src/ui/popup/widget.cpp

@@ -187,7 +187,7 @@ void ekg::ui::recursive_sync_ats_by_finding_tag(
 
     if (property.is_childnizate && property.is_children_docknizable) {
       ekg::ui::recursive_sync_ats_by_finding_tag(
-        ekg::query<ekg::property_t>(property.parent_at),
+        ekg::query<ekg::property_t>(at),
         ats_to_sync,
         tag
       );
@@ -250,6 +250,7 @@ void ekg::ui::event(
       bool is_linked_hovering {};
       bool is_this_popup_being_hovered {};
       bool is_hovering_any_linked_widget {};
+      bool is_hovering_a_popup_sensitive_widget {};
       bool should_force_update_popup_position {};
 
       ekg::rect_t<float> rect_position {};
@@ -267,6 +268,8 @@ void ekg::ui::event(
            * Check if the hovered property is a popup.
            **/
           ekg::property_t &wproperty {ekg::query<ekg::property_t>(descriptor.property_at)};
+          is_hovering_a_popup_sensitive_widget = wproperty.states.is_sensitive;
+
           if (
             wproperty != ekg::property_t::not_found
             &&
@@ -409,6 +412,8 @@ void ekg::ui::event(
             &&
             ekg::gui.ui.hovered_type != ekg::type::popup
             &&
+            is_hovering_a_popup_sensitive_widget
+            &&
             is_this_popup_being_hovered
             &&
             !is_hovering_any_linked_widget