Start on global settings, add tint color setting

src/gui/Button.cpp

@@ -12,7 +12,15 @@ namespace gsr {
     static const float padding_left_scale = 0.007f;
     static const float padding_right_scale = 0.007f;
 
-    Button::Button(mgl::Font *font, const char *text, mgl::vec2f size, mgl::Color bg_color) : size(size), bg_color(bg_color), text(text, *font) {
+    // These are relative to the button size
+    static const float padding_top_icon_scale = 0.25f;
+    static const float padding_bottom_icon_scale = 0.25f;
+    static const float padding_left_icon_scale = 0.25f;
+    static const float padding_right_icon_scale = 0.25f;
+
+    Button::Button(mgl::Font *font, const char *text, mgl::vec2f size, mgl::Color bg_color) :
+        size(size), bg_color(bg_color), bg_hover_color(bg_color), text(text, *font)
+    {
 
     }
 
@@ -37,17 +45,23 @@ namespace gsr {
             return;
 
         const mgl::vec2f draw_pos = position + offset;
-
         const mgl::vec2f item_size = get_size().floor();
+        const bool mouse_inside = mgl::FloatRect(draw_pos, item_size).contains(window.get_mouse_position().to_vec2f()) && !has_parent_with_selected_child_widget();
+
         mgl::Rectangle background(item_size);
         background.set_position(draw_pos.floor());
-        background.set_color(bg_color);
+        background.set_color(mouse_inside ? bg_hover_color : bg_color);
         window.draw(background);
 
         text.set_position((draw_pos + item_size * 0.5f - text.get_bounds().size * 0.5f).floor());
         window.draw(text);
 
-        const bool mouse_inside = mgl::FloatRect(draw_pos, item_size).contains(window.get_mouse_position().to_vec2f()) && !has_parent_with_selected_child_widget();
+        if(sprite.get_texture() && sprite.get_texture()->is_valid()) {
+            scale_sprite_to_button_size();
+            sprite.set_position((background.get_position() + background.get_size() * 0.5f - sprite.get_size() * 0.5f).floor());
+            window.draw(sprite);
+        }
+
         if(mouse_inside) {
             const mgl::Color outline_color = (bg_color == get_color_theme().tint_color) ? mgl::Color(255, 255, 255) : get_color_theme().tint_color;
             draw_rectangle_outline(window, draw_pos, item_size, outline_color, std::max(1.0f, border_scale * get_theme().window_height));
@@ -76,6 +90,14 @@ namespace gsr {
         border_scale = scale;
     }
 
+    void Button::set_bg_hover_color(mgl::Color color) {
+        bg_hover_color = color;
+    }
+
+    void Button::set_icon(mgl::Texture *texture) {
+        sprite.set_texture(texture);
+    }
+
     const std::string& Button::get_text() const {
         return text.get_string();
     }
@@ -83,4 +105,18 @@ namespace gsr {
     void Button::set_text(std::string str) {
         text.set_string(std::move(str));
     }
+
+    void Button::scale_sprite_to_button_size() {
+        if(!sprite.get_texture() || !sprite.get_texture()->is_valid())
+            return;
+
+        const mgl::vec2f button_size = get_size();
+        const int padding_icon_top = padding_top_icon_scale * button_size.y;
+        const int padding_icon_bottom = padding_bottom_icon_scale * button_size.y;
+        const int padding_icon_left = padding_left_icon_scale * button_size.y;
+        const int padding_icon_right = padding_right_icon_scale * button_size.y;
+
+        const mgl::vec2f desired_size = button_size - mgl::vec2f(padding_icon_left + padding_icon_right, padding_icon_top + padding_icon_bottom);
+        sprite.set_size(scale_keep_aspect_ratio(sprite.get_texture()->get_size().to_vec2f(), desired_size).floor());
+    }
 }

src/gui/GlobalSettingsPage.cpp

@@ -0,0 +1,83 @@
+#include "../../include/gui/GlobalSettingsPage.hpp"
+
+#include "../../include/Theme.hpp"
+#include "../../include/gui/GsrPage.hpp"
+#include "../../include/gui/PageStack.hpp"
+#include "../../include/gui/ScrollablePage.hpp"
+#include "../../include/gui/Subsection.hpp"
+#include "../../include/gui/List.hpp"
+#include "../../include/gui/Label.hpp"
+#include "../../include/gui/RadioButton.hpp"
+
+namespace gsr {
+    static const char* gpu_vendor_to_color_name(GpuVendor vendor) {
+        switch(vendor) {
+            case GpuVendor::UNKNOWN: return "amd";
+            case GpuVendor::AMD:     return "amd";
+            case GpuVendor::INTEL:   return "intel";
+            case GpuVendor::NVIDIA:  return "nvidia";
+        }
+        return "amd";
+    }
+
+    GlobalSettingsPage::GlobalSettingsPage(const GsrInfo *gsr_info, Config &config, PageStack *page_stack) :
+        StaticPage(mgl::vec2f(get_theme().window_width, get_theme().window_height).floor()),
+        config(config),
+        gsr_info(gsr_info),
+        page_stack(page_stack)
+    {
+        auto content_page = std::make_unique<GsrPage>();
+        content_page->add_button("Back", "back", get_color_theme().page_bg_color);
+        content_page->on_click = [page_stack](const std::string &id) {
+            if(id == "back")
+                page_stack->pop();
+        };
+        content_page_ptr = content_page.get();
+        add_widget(std::move(content_page));
+
+        add_widgets();
+        load();
+    }
+
+    std::unique_ptr<Subsection> GlobalSettingsPage::create_appearance_subsection(ScrollablePage *parent_page) {
+        auto list = std::make_unique<List>(List::Orientation::VERTICAL);
+        list->add_widget(std::make_unique<Label>(&get_theme().body_font, "Tint color", get_color_theme().text_color));
+        auto tint_color_radio_button = std::make_unique<RadioButton>(&get_theme().body_font, RadioButton::Orientation::HORIZONTAL);
+        tint_color_radio_button_ptr = tint_color_radio_button.get();
+        tint_color_radio_button->add_item("Red", "amd");
+        tint_color_radio_button->add_item("Green", "nvidia");
+        tint_color_radio_button->add_item("blue", "intel");
+        tint_color_radio_button->on_selection_changed = [](const std::string&, const std::string &id) {
+            if(id == "amd")
+                get_color_theme().tint_color = mgl::Color(221, 0, 49);
+            else if(id == "nvidia")
+                get_color_theme().tint_color = mgl::Color(118, 185, 0);
+            else if(id == "intel")
+                get_color_theme().tint_color = mgl::Color(8, 109, 183);
+        };
+        list->add_widget(std::move(tint_color_radio_button));
+        return std::make_unique<Subsection>("Appearance", std::move(list), mgl::vec2f(parent_page->get_inner_size().x, 0.0f));
+    }
+
+    void GlobalSettingsPage::add_widgets() {
+        auto scrollable_page = std::make_unique<ScrollablePage>(content_page_ptr->get_inner_size());
+        scrollable_page->add_widget(create_appearance_subsection(scrollable_page.get()));
+        content_page_ptr->add_widget(std::move(scrollable_page));
+    }
+
+    void GlobalSettingsPage::on_navigate_away_from_page() {
+        save();
+    }
+
+    void GlobalSettingsPage::load() {
+        if(config.main_config.tint_color.empty())
+            tint_color_radio_button_ptr->set_selected_item(gpu_vendor_to_color_name(gsr_info->gpu_info.vendor));
+        else
+            tint_color_radio_button_ptr->set_selected_item(config.main_config.tint_color);
+    }
+
+    void GlobalSettingsPage::save() {
+        config.main_config.tint_color = tint_color_radio_button_ptr->get_selected_id();
+        save_config(config);
+    }
+}

src/gui/SettingsPage.cpp

@@ -27,8 +27,7 @@ namespace gsr {
         type(type),
         config(config),
         gsr_info(gsr_info),
-        page_stack(page_stack),
-        settings_title_text("Settings", get_theme().title_font)
+        page_stack(page_stack)
     {
         audio_devices = get_audio_devices();
         application_audio = get_application_audio();

src/gui/Utils.cpp

@@ -50,4 +50,21 @@ namespace gsr {
     void set_frame_delta_seconds(double frame_delta) {
         frame_delta_seconds = frame_delta;
     }
+
+    mgl::vec2f scale_keep_aspect_ratio(mgl::vec2f from, mgl::vec2f to) {
+        if(std::abs(from.x) <= 0.0001f || std::abs(from.y) <= 0.0001f)
+            return {0.0f, 0.0f};
+
+        const double height_to_width_ratio = (double)from.y / (double)from.x;
+        from.x = to.x;
+        from.y = from.x * height_to_width_ratio;
+        
+        if(from.y > to.y) {
+            const double width_height_ratio = (double)from.x / (double)from.y;
+            from.y = to.y;
+            from.x = from.y * width_height_ratio;
+        }
+
+        return from;
+    }
 }