- ColorPicker: handle events for all sub widgets

- add [[nodiscard]] to all  handle_event functions, that don't have it yet

Author: Totto16

src/scenes/recording_selector/recording_chooser.hpp

@@ -27,7 +27,7 @@ namespace custom_ui {
 
         void render(const ServiceProvider& service_provider) const override;
 
-        Widget::EventHandleResult handle_event(const SDL_Event& event, const Window* window) override;
+        [[nodiscard]] Widget::EventHandleResult handle_event(const SDL_Event& event, const Window* window) override;
 
         [[nodiscard]] const std::vector<std::filesystem::path>& get_currently_chosen_files() const;
 

src/scenes/recording_selector/recording_component.hpp

@@ -46,7 +46,7 @@ namespace custom_ui {
 
         void render(const ServiceProvider& service_provider) const override;
 
-        Widget::EventHandleResult handle_event(const SDL_Event& event, const Window* window) override;
+        [[nodiscard]] Widget::EventHandleResult handle_event(const SDL_Event& event, const Window* window) override;
 
         [[nodiscard]] data::RecordingMetadata metadata() const;
 

src/scenes/settings_menu/color_setting_row.hpp

@@ -36,7 +36,7 @@ namespace detail {
 
         void render(const ServiceProvider& service_provider) const override;
 
-        Widget::EventHandleResult handle_event(const SDL_Event& event, const Window* window) override;
+        [[nodiscard]] Widget::EventHandleResult handle_event(const SDL_Event& event, const Window* window) override;
     };
 
 
@@ -92,7 +92,7 @@ namespace custom_ui {
 
         void render(const ServiceProvider& service_provider) const override;
 
-        Widget::EventHandleResult handle_event(const SDL_Event& event, const Window* window) override;
+        [[nodiscard]] Widget::EventHandleResult handle_event(const SDL_Event& event, const Window* window) override;
 
         [[nodiscard]] scenes::Scene::Change get_details_scene() override;
 

src/ui/components/button.hpp

@@ -82,7 +82,7 @@ namespace ui {
             m_content.render(service_provider);
         }
 
-        Widget::EventHandleResult handle_event(const SDL_Event& event, const Window* window) override {
+        [[nodiscard]] Widget::EventHandleResult handle_event(const SDL_Event& event, const Window* window) override {
             if (not m_enabled) {
                 return false;
             }

src/ui/components/color_picker.cpp

@@ -455,7 +455,24 @@ ui::ColorPicker::handle_event(const SDL_Event& event, const Window* window) {
         return handled;
     }
 
-    return m_color_canvas->handle_event(event, window);
+    handled = m_color_canvas->handle_event(event, window);
+
+    if (handled) {
+        return handled;
+    }
+
+
+    if (m_mode == ColorMode::HSV) {
+        handled = m_hsv_button->handle_event(event, window);
+    } else {
+        handled = m_rgb_button->handle_event(event, window);
+    }
+
+    if (handled) {
+        return handled;
+    }
+
+    return m_color_text->handle_event(event, window);
 }
 
 void ui::ColorPicker::after_color_change(detail::ColorChangeOrigin origin, const HSVColor& color) {

src/ui/components/color_picker.hpp

@@ -62,7 +62,7 @@ namespace detail {
 
         void render(const ServiceProvider& service_provider) const override;
 
-        Widget::EventHandleResult handle_event(const SDL_Event& event, const Window* window) override;
+        [[nodiscard]] Widget::EventHandleResult handle_event(const SDL_Event& event, const Window* window) override;
 
         void on_change(ColorChangeOrigin origin, const HSVColor& color);
 
@@ -116,7 +116,7 @@ namespace ui {
 
         void render(const ServiceProvider& service_provider) const override;
 
-        Widget::EventHandleResult handle_event(const SDL_Event& event, const Window* window) override;
+        [[nodiscard]] Widget::EventHandleResult handle_event(const SDL_Event& event, const Window* window) override;
 
         [[nodiscard]] Color get_color() const;
 

src/ui/components/image_view.hpp

@@ -27,6 +27,6 @@ namespace ui {
 
         void render(const ServiceProvider& service_provider) const override;
 
-        Widget::EventHandleResult handle_event(const SDL_Event&, const Window*) override;
+        [[nodiscard]] Widget::EventHandleResult handle_event(const SDL_Event&, const Window*) override;
     };
 } // namespace ui

src/ui/components/label.hpp

@@ -22,7 +22,7 @@ namespace ui {
 
         void render(const ServiceProvider& service_provider) const override;
 
-        Widget::EventHandleResult handle_event(const SDL_Event&, const Window*) override;
+        [[nodiscard]] Widget::EventHandleResult handle_event(const SDL_Event&, const Window*) override;
 
         void set_text(const ServiceProvider& service_provider, const std::string& text);
     };

src/ui/components/link_label.hpp

@@ -44,7 +44,7 @@ namespace ui {
 
         void render(const ServiceProvider& service_provider) const override;
 
-        Widget::EventHandleResult handle_event(const SDL_Event& event, const Window* window) override;
+        [[nodiscard]] Widget::EventHandleResult handle_event(const SDL_Event& event, const Window* window) override;
 
         void on_clicked();