use the ui::EventHandleType::RequestAction method instead of an callback for the enter press of the textinput

Author: Totto16

src/scenes/online_lobby/online_lobby.cpp

@@ -1,6 +1,7 @@
 #include "online_lobby.hpp"
 #include "graphics/window.hpp"
 #include "helper/constants.hpp"
+#include "helper/errors.hpp"
 #include "manager/music_manager.hpp"
 #include "manager/resource_manager.hpp"
 #include "ui/components/textinput.hpp"
@@ -51,10 +52,7 @@ namespace scenes {
                         service_provider->fonts().get(FontId::Symbola), Color::white(), focus_helper.focus_id(),
                         std::pair<double, double>{ 0.9, 0.9 },
                         ui::Alignment{ ui::AlignmentHorizontal::Middle, ui::AlignmentVertical::Center },
-                        ui::TextInputMode::Scroll,
-                        [i](const std::string& value) -> void {
-                            spdlog::info("Pressed Enter on TextInput {}: {}", i, value);
-                        }
+                        ui::TextInputMode::Scroll
                 );
             } else {
                 scroll_layout->add<ui::TextButton>(
@@ -121,7 +119,32 @@ namespace scenes {
         // description of intentional behaviour of this scene, even if it seems off:
         // the return button or the scroll layout can have the focus, if the scroll_layout has the focus, it can be scrolled by the scroll wheel and you can move around the focused item of the scroll_layout with up and down, but not with TAB, with tab you can change the focus to the return button, where you can't use the scroll wheel or up / down to change the scroll items, but you still can use click events, they are not affected by focus
 
-        if (m_main_layout.handle_event(event, window)) {
+        if (const auto event_result = m_main_layout.handle_event(event, window)) {
+
+            if (const auto additional = event_result.get_additional(); additional.has_value()) {
+                const auto value = additional.value();
+
+                if (value.first == ui::EventHandleType::RequestAction) {
+
+
+                    if (auto* text_input = dynamic_cast<ui::TextInput*>(value.second); text_input != nullptr) {
+                        spdlog::info("Pressed Enter on TextInput  {}", text_input->get_text());
+
+                        if (text_input->has_focus()) {
+                            text_input->unfocus();
+                        }
+                        return true;
+                    }
+
+
+                    throw std::runtime_error("Requested action on unknown widget, this is a fatal error");
+                }
+
+                throw helper::FatalError(
+                        fmt::format("Unsupported Handle Type: {}", magic_enum::enum_name(additional->first))
+                );
+            }
+
             return true;
         }
 

src/scenes/settings_menu/color_setting_row.cpp

@@ -1,11 +1,13 @@
 
 #include "color_setting_row.hpp"
+#include "helper/errors.hpp"
 #include "helper/utils.hpp"
 #include "ui/components/label.hpp"
 #include "ui/focusable.hpp"
 #include "ui/hoverable.hpp"
 #include "ui/layout.hpp"
 #include "ui/widget.hpp"
+
 #include <functional>
 
 detail::ColorSettingRectangle::ColorSettingRectangle(
@@ -168,6 +170,8 @@ custom_ui::ColorSettingRow::handle_event(const SDL_Event& event, const Window* w
                 {ui::EventHandleType::RequestAction, this}
             };
         }
+
+        throw helper::FatalError(fmt::format("Unsupported Handle Type: {}", magic_enum::enum_name(additional->first)));
     }
 
     return result;

src/ui/components/color_picker.cpp

@@ -403,21 +403,6 @@ ui::ColorPicker::ColorPicker(
             service_provider, service_provider->fonts().get(FontId::Default), Color::white(), focus_id_unused,
             std::pair<double, double>{ 0.9, 0.9 },
             ui::Alignment{ ui::AlignmentHorizontal::Middle, ui::AlignmentVertical::Center }, ui::TextInputMode::Scale,
-            [this](const std::string& value) -> void {
-                const auto maybe_color = HSVColor::from_string(value);
-
-                if (not maybe_color.has_value()) {
-                    //TODO: maybe inform the user, that the input is incorrect?
-                    //m_color_text->display_error();
-
-                    return;
-                }
-
-                const auto color = maybe_color.value();
-                m_color = Color{ color };
-
-                after_color_change(detail::ColorChangeOrigin::TextInput, color);
-            },
             textinput_layout, false
     );
 
@@ -506,9 +491,27 @@ ui::ColorPicker::handle_event(const SDL_Event& event, const Window* window) {
                         m_color_text->unfocus();
                     }
                     break;
-                case ui::EventHandleType::RequestAction:
-                    //TODO use instead of callback
-                    throw std::runtime_error("TODO");
+                case ui::EventHandleType::RequestAction: {
+                    const auto maybe_color = HSVColor::from_string(m_color_text->get_text());
+
+                    if (m_color_text->has_focus()) {
+                        m_color_text->unfocus();
+                    }
+
+                    if (not maybe_color.has_value()) {
+                        //TODO: maybe inform the user, that the input is incorrect?
+                        //m_color_text->display_error();
+
+                        break;
+                    }
+
+                    const auto color = maybe_color.value();
+                    m_color = Color{ color };
+
+                    after_color_change(detail::ColorChangeOrigin::TextInput, color);
+
+                    break;
+                }
                 default:
                     utils::unreachable();
             }

src/ui/components/textinput.cpp

@@ -17,7 +17,6 @@ ui::TextInput::TextInput(
         u32 focus_id,
         const shapes::URect& fill_rect,
         TextInputMode mode,
-        EnterCallback enter_callback,
         const Layout& layout,
         bool is_top_level
 )
@@ -33,8 +32,7 @@ ui::TextInput::TextInput(
       ) },
       m_scaled_text_size{ 0 },
       m_timer{ [this]() { this->m_cursor_shown = !this->m_cursor_shown; }, 500ms },
-      m_mode{ mode },
-      m_enter_callback{ std::move(enter_callback) } {
+      m_mode{ mode } {
     recalculate_textures(false);
 
     // if on top. we give us focus automatically
@@ -51,7 +49,6 @@ ui::TextInput::TextInput(
         std::pair<double, double> size,
         Alignment alignment,
         TextInputMode mode,
-        EnterCallback enter_callback,
         const Layout& layout,
         bool is_top_level
 )
@@ -66,7 +63,6 @@ ui::TextInput::TextInput(
                          alignment
                  ),
                  mode,
-                 std::move(enter_callback),
                  layout,
                  is_top_level } { }
 
@@ -127,11 +123,10 @@ ui::TextInput::handle_event( // NOLINT(readability-function-cognitive-complexity
         case SDL_KEYDOWN: {
             switch (event.key.keysym.sym) {
                 case SDLK_RETURN: {
-                    m_enter_callback(m_text);
                     on_unfocus();
                     return {
                         true,
-                        {EventHandleType::RequestUnFocus, this}
+                        {EventHandleType::RequestAction, this}
                     };
                 }
                 case SDLK_BACKSPACE: {
@@ -247,6 +242,10 @@ void ui::TextInput::set_text(const std::string& text) {
     }
 }
 
+[[nodiscard]] const std::string& ui::TextInput::get_text() const {
+    return m_text;
+}
+
 void ui::TextInput::recalculate_textures(bool text_changed) {
 
     const auto& renderer = m_service_provider->renderer();

src/ui/components/textinput.hpp

@@ -15,8 +15,6 @@ namespace ui {
     enum class TextInputMode { Scroll, Scale };
 
     struct TextInput final : public Widget, public Focusable, public Hoverable {
-        using EnterCallback = std::function<void(const std::string& value)>;
-
     private:
         std::string m_text{};
         u32 m_cursor_position{ 0 };
@@ -31,7 +29,6 @@ namespace ui {
         bool m_cursor_shown{ true };
         helper::Timer m_timer;
         TextInputMode m_mode;
-        EnterCallback m_enter_callback;
 
         explicit TextInput(
                 ServiceProvider* service_provider,
@@ -40,7 +37,6 @@ namespace ui {
                 u32 focus_id,
                 const shapes::URect& fill_rect,
                 TextInputMode mode,
-                EnterCallback enter_callback,
                 const Layout& layout,
                 bool is_top_level
         );
@@ -54,7 +50,6 @@ namespace ui {
                 std::pair<double, double> size,
                 Alignment alignment,
                 TextInputMode mode,
-                EnterCallback enter_callback,
                 const Layout& layout,
                 bool is_top_level
         );
@@ -73,6 +68,8 @@ namespace ui {
 
         void set_text(const std::string& text);
 
+        [[nodiscard]] const std::string& get_text() const;
+
     private:
         void recalculate_textures(bool text_changed);