[fix] scrollbar on new model implementation

Author: mrsrina

include/ekg/io/input.hpp

@@ -41,7 +41,7 @@ namespace ekg {
 
   struct input_t {
   public:
-    float scroll_speed {0.8f};
+    float scroll_speed {0.2f};
     ekg::timing_t ui_timeout_timing {};
     ekg::timing_t ui_scrolling_timing {};
     ekg::timing_t timing_last_interact {};

include/ekg/io/log.hpp

@@ -17,10 +17,10 @@ namespace ekg {
   public:
     static void flush() {
       if (ekg::log::buffered) {
-        #ifdef __ANDROID__
-        __android_log_print(ANDROID_LOG_VERBOSE, "EKG", "%s", ekg::log::buffer.str().c_str());
+        #if defined(__ANDROID__)
+          __android_log_print(ANDROID_LOG_VERBOSE, "EKG", "%s", ekg::log::buffer.str().c_str());
         #else
-        std::cout << ekg::log::buffer.str();
+          std::cout << ekg::log::buffer.str();
         #endif
 
         ekg::log::buffer = std::ostringstream {};
@@ -56,9 +56,10 @@ namespace ekg {
 
     ~log() {
       ekg::log::buffer << '\n';
-      #ifdef EKG_LOG_DEBUG
-      ekg::log::flush();
-      std::cout << std::endl;
+
+      #if defined(EKG_LOG_DEBUG)
+        ekg::log::flush();
+        std::cout << std::endl;
       #endif
     }
 

include/ekg/io/safety.hpp

@@ -32,6 +32,7 @@
 #include "ekg/ui/frame/frame_widget.hpp"
 #include "ekg/ui/label/label_widget.hpp"
 #include "ekg/ui/checkbox/checkbox_widget.hpp"
+#include "ekg/ui/scrollbar/scrollbar_widget.hpp"
 
 namespace ekg::io {
   template<typename t>
@@ -60,6 +61,10 @@ namespace ekg {
       .is_visible = true
     };
 
+    ekg::properties_t *p_current_parent_properties {
+      ekg::p_core->get_current_parent_properties()
+    };
+
     ekg::theme_t &current_global_theme {ekg::p_core->service_theme.get_current_theme()};
 
     switch (descriptor.type) {
@@ -168,16 +173,43 @@ namespace ekg {
         break;
       }
 
+      case ekg::type::scrollbar: {
+        ekg::scrollbar_t &scrollbar {
+          ekg::io::any_static_cast<ekg::scrollbar_t>(
+            &descriptor
+          )
+        };
+
+        ekg::ui::scrollbar *p_scrollbar {
+          ekg::io::new_widget_instance<ekg::ui::scrollbar>()
+        };
+
+        p_scrollbar->descriptor = scrollbar;
+        p_scrollbar->descriptor.theme = current_global_theme.scrollbar;
+
+        properties.p_descriptor = &p_scrollbar->descriptor;
+        properties.p_widget = p_scrollbar;
+        properties.is_docknizable = false;
+        properties.is_parentable = true;
+
+        p_created_widget = dynamic_cast<ekg::ui::abstract*>(p_scrollbar);
+
+        if (p_current_parent_properties) {
+          p_scrollbar->descriptor.p_binded_children = &p_current_parent_properties->children;
+          p_scrollbar->descriptor.p_binded_rect = (
+            static_cast<ekg::ui::abstract*>(p_current_parent_properties->p_widget)->p_descriptor_rect
+          );
+        }
+
+        break;
+      }
+
     default:
       break;
     }
 
     p_created_widget->properties = properties;
 
-    ekg::properties_t *p_current_parent_properties {
-      ekg::p_core->get_current_parent_properties()
-    };
-
     if (
       p_created_widget->properties.is_parentable
       &&

include/ekg/layout/docknize.hpp

@@ -72,7 +72,7 @@ namespace ekg::layout {
     float container_dimension,
     float offset
   ) {
-    return ekg::min_clamp(
+    return ekg::clamp_min(
       (
         (side_a + (container_dimension - side_a) + offset)
         -

include/ekg/math/geometry.hpp

@@ -342,18 +342,18 @@ namespace ekg {
   }
 
   template<typename t>
-  constexpr t min_clamp(t a, t b) {
+  constexpr t clamp_min(t a, t b) {
     return a < b ? b : a;
   }
 
   template<typename t>
-  constexpr t max_clamp(t a, t b) {
+  constexpr t clamp_max(t a, t b) {
     return a > b ? b : a;
   }
 
   template<typename t>
   constexpr t clamp(t a, t b, t c) {
-    return ekg::min_clamp(ekg::max_clamp(a, c), b);
+    return ekg::clamp_min(ekg::clamp_max(a, c), b);
   }
 
   template<typename t>
@@ -363,13 +363,18 @@ namespace ekg {
   ) {
     const t zero {}; 
     return ekg::rect_t<t> {
-      ekg::min_clamp<t>(rect.x, zero),
-      ekg::min_clamp<t>(rect.y, zero),
-      ekg::max_clamp<t>(rect.w, square),
-      ekg::max_clamp<t>(rect.h, square)
+      ekg::clamp_min<t>(rect.x, zero),
+      ekg::clamp_min<t>(rect.y, zero),
+      ekg::clamp_max<t>(rect.w, square),
+      ekg::clamp_max<t>(rect.h, square)
     };
   }
 
+  template<typename t>
+  constexpr t lerp(t x, t y, t delta) {
+    return x + (y - x) * delta;
+  }
+
   struct rect_descriptor_t {
   public:
     ekg::rect_t<float> *p_rect {};
@@ -406,8 +411,8 @@ namespace ekg {
         )
       );
 
-      aligned.w = ekg::min_clamp<float>(rect.w + aligned.offset * 2, minimum_size);
-      aligned.h = ekg::min_clamp<float>(rect.h + dimension_offset, minimum_size);
+      aligned.w = ekg::clamp_min<float>(rect.w + aligned.offset * 2, minimum_size);
+      aligned.h = ekg::clamp_min<float>(rect.h + dimension_offset, minimum_size);
       break;
     case ekg::axis::vertical:
       dimension_offset = (
@@ -424,8 +429,8 @@ namespace ekg {
         )
       );
 
-      aligned.h = ekg::min_clamp<float>(rect.h + aligned.offset * 2, minimum_size);
-      aligned.w = ekg::min_clamp<float>(rect.w + dimension_offset, minimum_size);
+      aligned.h = ekg::clamp_min<float>(rect.h + aligned.offset * 2, minimum_size);
+      aligned.w = ekg::clamp_min<float>(rect.w + dimension_offset, minimum_size);
       break;
     }
   }

include/ekg/ui/checkbox/checkbox.hpp

@@ -28,7 +28,7 @@ namespace ekg {
 
   struct checkbox_t {
   public:
-    const static ekg::flags_t box {1};
+    constexpr static ekg::flags_t box {1};
   public:
     std::string tag {};
     ekg::flags_t dock {};

include/ekg/ui/scrollbar/scrollbar.hpp

@@ -3,25 +3,36 @@
 
 #include "ekg/math/geometry.hpp"
 #include "ekg/ui/properties.hpp"
+#include "ekg/io/gpu.hpp"
 
 namespace ekg {
   struct scrollbar_theme_t {
   public:
     ekg::vec4_t<float> background {};
     ekg::vec4_t<float> outline {};
-    ekg::vec4_t<float> bar {};
     ekg::vec4_t<float> highlight {};
+    ekg::vec4_t<float> active {};
     int32_t pixel_thickness {};
     float min_bar_size {};
+
+    /**
+     * [0] ekg::scrollbar_t::horizontal
+     * [1] ekg::scrollbar_t::vertical
+     **/
+    ekg::layer_t<2> layers {};
   };
 
   struct scrollbar_t {
+  public:
+    constexpr static ekg::flags_t horizontal {0};
+    constexpr static ekg::flags_t vertical {1};
   public:
     std::string tag {};
     ekg::vec2_t<bool> axis {true, true};
     std::vector<ekg::properties_t*> *p_binded_children {};
     ekg::rect_t<float> *p_binded_rect {};
     ekg::type type {ekg::type::scrollbar};
+    ekg::scrollbar_theme_t theme {};
   };
 }
 

include/ekg/ui/scrollbar/scrollbar_widget.hpp

@@ -16,6 +16,9 @@ namespace ekg::ui {
     ekg::vec4_t<float> scroll {};
     ekg::vec2_t<float> delta {};
     ekg::vec2_t<float> acceleration {};
+
+    ekg::ui::states_t bar_horizontal_states {};
+    ekg::ui::states_t bar_vertical_states {};
   public:
     void clamp_scroll();
     void reset_scroll();

src/core/runtime.cpp

@@ -155,21 +155,21 @@ void ekg::runtime::init() {
 
       if (this->draw_fr_normal.font_size != font_size) {
         this->draw_fr_small.set_size(
-          ekg::min_clamp(
+          ekg::clamp_min(
             font_size - ekg::dpi.font_offset.x,
             ekg::minimum_small_font_height
           )
         );
 
         this->draw_fr_normal.set_size(
-          ekg::min_clamp(
+          ekg::clamp_min(
             font_size,
             ekg::minimum_font_height
           )
         );
 
         this->draw_fr_big.set_size(
-          ekg::min_clamp(
+          ekg::clamp_min(
             font_size + ekg::dpi.font_offset.y,
             ekg::minimum_big_font_height
           )
@@ -229,11 +229,12 @@ void ekg::runtime::poll_events() {
     this->service_input.input
   };
 
-  bool is_on_scrolling_timeout {!ekg::reach(&input.ui_scrolling_timing, 250)};
+  bool is_on_scrolling_timeout {!ekg::reach(&input.ui_scrolling_timing, 100)};
   ekg::current.unique_id *= !(input.was_pressed || input.was_released || input.has_motion);
 
   if (
-      this->p_abs_activity_widget != nullptr &&
+      this->p_abs_activity_widget != nullptr
+      &&
       (this->p_abs_activity_widget->states.is_absolute || is_on_scrolling_timeout)
     ) {
 

src/draw/font_renderer.cpp

@@ -68,7 +68,7 @@ float ekg::draw::font_renderer::get_text_width(std::string_view text, int32_t &l
     break_text = char8 == '\n';
     if (break_text || (r_n_break_text = (char8 == '\r' && it < text_size && text.at(it + 1) == '\n'))) {
       it += static_cast<uint64_t>(r_n_break_text);
-      largest_text_width = ekg::min_clamp(largest_text_width, text_width);
+      largest_text_width = ekg::clamp_min(largest_text_width, text_width);
       text_width = 0.0f;
       lines_count++;
       continue;
@@ -115,8 +115,8 @@ float ekg::draw::font_renderer::get_text_width(std::string_view text, int32_t &l
     text_width += this->mapped_glyph_char_data[char32].wsize;
   }
 
-  lines = ekg::min_clamp(lines, lines_count);
-  largest_text_width = ekg::min_clamp(largest_text_width, text_width);
+  lines = ekg::clamp_min(lines, lines_count);
+  largest_text_width = ekg::clamp_min(largest_text_width, text_width);
 
   return largest_text_width;
 }
@@ -157,7 +157,7 @@ float ekg::draw::font_renderer::get_text_width(std::string_view text) {
     break_text = char8 == '\n';
     if (break_text || (r_n_break_text = (char8 == '\r' && it < text_size && text.at(it + 1) == '\n'))) {
       it += static_cast<uint64_t>(r_n_break_text);
-      largest_text_width = ekg::min_clamp(largest_text_width, text_width);
+      largest_text_width = ekg::clamp_min(largest_text_width, text_width);
       text_width = 0.0f;
       continue;
     }
@@ -203,7 +203,7 @@ float ekg::draw::font_renderer::get_text_width(std::string_view text) {
     text_width += char_data.wsize;
   }
 
-  largest_text_width = ekg::min_clamp(largest_text_width, text_width);
+  largest_text_width = ekg::clamp_min(largest_text_width, text_width);
   return largest_text_width;
 }
 
@@ -339,14 +339,14 @@ void ekg::draw::font_renderer::reload() {
     char_data.wsize = static_cast<float>(static_cast<int32_t>(ft_glyph_slot->advance.x >> 6));
 
     this->atlas_rect.w += static_cast<int32_t>(char_data.w);
-    this->atlas_rect.h = ekg::min_clamp<int32_t>(this->atlas_rect.h, static_cast<int32_t>(char_data.h));
+    this->atlas_rect.h = ekg::clamp_min<int32_t>(this->atlas_rect.h, static_cast<int32_t>(char_data.h));
 
-    p_font_face_picked->highest_glyph_size.x = ekg::min_clamp(
+    p_font_face_picked->highest_glyph_size.x = ekg::clamp_min(
       static_cast<int32_t>(p_font_face_picked->highest_glyph_size.x),
       static_cast<int32_t>(char_data.w)
     );
 
-    p_font_face_picked->highest_glyph_size.y = ekg::min_clamp(
+    p_font_face_picked->highest_glyph_size.y = ekg::clamp_min(
       static_cast<int32_t>(p_font_face_picked->highest_glyph_size.y),
       static_cast<int32_t>(char_data.h)
     );