[fix][update] no-behavior out of margin for frame fixed; added frame callbacks and layers (#47)

-- Behaviors: drag, resize, scroll etc; are able now to do anywhere.
-- Actions and layers implemented for frame widget.

Author: mrsrina

cmake/properties.cmake

@@ -1,4 +1,4 @@
-set(EKG_VERSION 2.3.0)
+set(EKG_VERSION 2.3.1)
 set(EKG_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include")
 
 if(CMAKE_TOOLCHAIN_FILE)

include/ekg/io/event.hpp

@@ -43,9 +43,12 @@ namespace ekg {
     active_bg,
     active_outline,
     text_fg,
-    text_outline
+    text_outline,
+    warning_bg,
+    warning_fg,
+    warning_outline,
   };
-  constexpr size_t enum_layer_size {static_cast<size_t>(ekg::layer::text_outline)+1};
+  constexpr size_t enum_layer_size {static_cast<size_t>(ekg::layer::warning_outline)+1};
 
   enum class action {
     hover,

include/ekg/ui/frame/frame.hpp

@@ -26,11 +26,13 @@
 
 #include "ekg/io/descriptor.hpp"
 #include "ekg/math/geometry.hpp"
+#include "ekg/io/event.hpp"
 
 namespace ekg {
   struct frame_color_scheme_t {
   public:
     ekg::pixel_thickness_t actions_margin_pixel_thickness {5};
+    ekg::pixel_t margin {2.0f};
     ekg::rgba_t<uint8_t> background {};
     ekg::rgba_t<uint8_t> highlight {};
     ekg::rgba_t<uint8_t> outline {};
@@ -66,6 +68,8 @@ namespace ekg {
     bool set_top_level {};
     ekg::frame_color_scheme_t color_scheme {};
     ekg::frame_t::widget_t widget {};
+    ekg::at_array_t<ekg::action, ekg::enum_action_size> actions {};
+    ekg::at_array_t<ekg::layer, ekg::enum_layer_size> layers {};
   public:
     ekg_descriptor(ekg::frame_t);
   };

src/ui/frame/widget.cpp

@@ -66,18 +66,17 @@ void ekg::ui::event(
       ekg::input_info_t &input {ekg::p_core->handler_input.input};
       ekg::flags_t resize_over_dock {};
 
-      /*ekg::io::trigger(
+      ekg_action(
+        frame.actions,
+        ekg::action::hover,
         (
           input.has_motion
           &&
           property.states.is_hovering
           &&
-          (ekg::timing_t::second > ekg::tweaks.task_latency)
-        ),
-        ekg::action::motion,
-        frame.actions,
-        this->properties
-      );*/
+          (ekg::timing_t::second && ekg::gui.ui.frequency)
+        )
+      );
 
       if (
           input.was_pressed
@@ -135,38 +134,35 @@ void ekg::ui::event(
 
         property.states.is_absolute = property.states.is_active;
 
-        /*ekg::io::trigger(
-          true,
-          ekg::action::press,
+        ekg_action(
           frame.actions,
-          this->properties
-        );*/
+          ekg::action::press,
+          true
+        );
       } else if (input.has_motion && property.states.is_active) {
         ekg::rect_t<float> new_rect {rect};
         ekg::vec2_t<float> interact {static_cast<ekg::vec2_t<float>>(input.interact)};        
 
         resize_over_dock = frame.widget.target_dock_resize;
 
         if (frame.widget.target_dock_drag != ekg::dock::none && frame.widget.target_dock_resize == ekg::dock::none) {
-          /*ekg::io::trigger(
-            ekg::timing_t::second > ekg::tweaks.task_latency,
-            ekg::action::drag,
+          ekg_action(
             frame.actions,
-            this->properties
-          );*/
+            ekg::action::drag,
+            ekg::timing_t::second > ekg::gui.ui.frequency
+          );
 
           new_rect.x = interact.x - frame.widget.rect_delta.x;
           new_rect.y = interact.y - frame.widget.rect_delta.y;
           ekg::p_core->p_platform_base->system_cursor = ekg::system_cursor::size_all;
         }
 
         if (frame.widget.target_dock_resize != ekg::dock::none) {
-          /*ekg::io::trigger(
-            ekg::timing_t::second > ekg::tweaks.task_latency,
-            ekg::action::resize,
+          ekg_action(
             frame.actions,
-            this->properties
-          );*/
+            ekg::action::resize,
+            ekg::timing_t::second > ekg::gui.ui.frequency
+          );
 
           if (ekg::has(frame.widget.target_dock_resize, ekg::dock::left)) {
             interact.x = ekg::clamp_min<float>(interact.x, frame.widget.rect_delta.x);
@@ -262,14 +258,11 @@ void ekg::ui::event(
 
       if (input.was_released) {
         if (property.states.is_active) {
-          property.states.is_absolute = false;
-
-          /*ekg::io::trigger(
-            property.states.is_hovering,
-            ekg::action::release,
+          ekg_action(
             frame.actions,
-            this->properties
-          );*/
+            ekg::action::release,
+            property.states.is_hovering
+          );
         }
 
         frame.widget.target_dock_resize = ekg::dock::none;
@@ -315,19 +308,30 @@ void ekg::ui::buffering(
     property.parent_at != ekg::at_t::not_found
   );
 
+  /**
+   * This allows scrolling and dragging behavior possible,
+   * every child from this frame will be spaced always
+   * ahead of margin.
+   **/
+  float margin_bound {frame.color_scheme.margin * 2.0f};
+  property.widget.rect_scissor.x += frame.color_scheme.margin;
+  property.widget.rect_scissor.y += frame.color_scheme.margin;
+  property.widget.rect_scissor.w -= margin_bound;
+  property.widget.rect_scissor.h -= margin_bound;
+
   ekg::draw::rect(
     rect,
     property.states.is_focused ? frame.color_scheme.focused_background : frame.color_scheme.background,
     ekg::draw::mode::fill,
-    ekg::at_t::not_found
+    frame.layers[ekg::layer::bg]
   );
 
   if (property.states.is_active) {
     ekg::draw::rect(
       rect,
       frame.color_scheme.highlight,
       ekg::draw::mode::fill,
-      ekg::at_t::not_found
+      frame.layers[ekg::layer::active_bg]
     );
   }
 
@@ -336,23 +340,23 @@ void ekg::ui::buffering(
       rect,
       frame.color_scheme.highlight,
       ekg::draw::mode::fill,
-      ekg::at_t::not_found
+      frame.layers[ekg::layer::highlight_bg]
     );
   }
 
   ekg::draw::rect(
     rect,
     property.states.is_focused ? frame.color_scheme.focused_outline : frame.color_scheme.outline,
     ekg::draw::mode::outline,
-    ekg::at_t::not_found
+    frame.layers[ekg::layer::outline]
   );
 
   if (property.states.is_warning) {
     ekg::draw::rect(
       rect,
       frame.color_scheme.warning_outline,
       ekg::draw::mode::outline,
-      ekg::at_t::not_found
+      frame.layers[ekg::layer::warning_outline]
     );
   }