[update] insert

Author: mrsrina

include/ekg/handler/input.hpp

@@ -71,6 +71,7 @@ namespace ekg {
     bool has_motion {};
     bool was_wheel {};
     bool was_typed {};
+    std::string_view typed {};
   };
 
   struct input_key_t {

include/ekg/ui/textbox/widget.hpp

@@ -54,6 +54,12 @@ namespace ekg::ui {
     ekg::textbox_t::cursor_t &cursor
   );
 
+  void handle_insert(
+    ekg::textbox_t &textbox,
+    ekg::textbox_t::cursor_t &cursor,
+    std::string_view typed
+  );
+
   void reload(
     ekg::property_t &property,
     ekg::textbox_t &textbox

src/handler/input/handler.cpp

@@ -261,12 +261,12 @@ void ekg::handler::input::poll_event() {
     case ekg::io::event_type::text_input: {
       this->input.was_pressed = true;
       this->input.was_typed = true;
+      this->input.typed = platform_event.text_input;
       break;
     }
 
     case ekg::io::event_type::key_down: {
       this->input.was_pressed = true;
-      this->input.was_typed = true;
 
       this->string_builder.clear();
 

src/handler/theme/handler.cpp

@@ -142,7 +142,7 @@ void ekg::handler::theme::init() {
   black_light_pinky_theme.textbox_color_scheme.text_select_outline = {245, 169, 184, 100};
 
   this->registry(black_light_pinky_theme.tag) = black_light_pinky_theme;
-  this->set_current_theme(black_light_pinky_theme.tag);
+  //this->set_current_theme(black_light_pinky_theme.tag);
 }
 
 void ekg::handler::theme::quit() {

src/ui/textbox/widget.cpp

@@ -326,6 +326,28 @@ void ekg::ui::handle_erase(
   cursor.delta = cursor.a;
 }
 
+void ekg::ui::handle_insert(
+  ekg::textbox_t &textbox,
+  ekg::textbox_t::cursor_t &cursor,
+  std::string_view typed
+) {
+  if (cursor.a != cursor.b) {
+    ekg::ui::handle_erase(textbox, cursor);
+  }
+
+  std::string line {textbox.text.at(cursor.a.y)};
+
+  line.insert(
+    line.begin() + cursor.a.x,
+    typed.begin(),
+    typed.end()
+  );
+
+  textbox.text.set(cursor.a.y, line);
+  cursor.a.x += ekg::utf8_length(typed);
+  cursor.b = cursor.a;
+}
+
 void ekg::ui::reload(
   ekg::property_t &property,
   ekg::textbox_t &textbox
@@ -513,7 +535,7 @@ void ekg::ui::event(
         );
       }
 
-      if (!input.was_typed) {
+      if (!input.was_typed && !input.was_pressed) {
         return;
       }
 
@@ -534,7 +556,7 @@ void ekg::ui::event(
       bool is_down_fired {ekg::fired("textbox-action-down")};
       bool is_modifier_down_fired {is_down_fired && is_modifier_fired};
 
-      if (is_left_fired || is_right_fired || is_up_fired || is_down_fired || is_action_erase_fired) {
+      if (is_left_fired || is_right_fired || is_up_fired || is_down_fired || is_action_erase_fired || input.was_typed) {
         textbox.widget.set_cursor_static = true;
       }
 
@@ -551,6 +573,7 @@ void ekg::ui::event(
       ekg::vec2_t<float> cursor_pos {};
       std::string line {};
 
+      ekg_log_low_level(input.was_typed);
 
       for (ekg::textbox_t::cursor_t &cursor : textbox.widget.cursors) {
         is_ab_equals = cursor.a == cursor.b;
@@ -769,6 +792,10 @@ void ekg::ui::event(
         if (is_action_erase_fired) {
           ekg::ui::handle_erase(textbox, cursor);
         }
+
+        if (input.was_typed) {
+          ekg::ui::handle_insert(textbox, cursor, input.typed);
+        }
       }
 
       break;