aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2024-12-09 16:29:36 +0100
committerdec05eba <dec05eba@protonmail.com>2024-12-09 16:29:36 +0100
commitf38661593795e51e45e2dc2ead8a7bf897d226f6 (patch)
treeb0fa0fbf02ec8fc0c624f1de4197350571677100 /include
parentf3565fdd77fb480575feec5de252466b093daf86 (diff)
Start on global settings, add tint color setting
Diffstat (limited to 'include')
-rw-r--r--include/Config.hpp1
-rw-r--r--include/Theme.hpp4
-rw-r--r--include/gui/Button.hpp7
-rw-r--r--include/gui/GlobalSettingsPage.hpp34
-rw-r--r--include/gui/SettingsPage.hpp2
-rw-r--r--include/gui/Utils.hpp1
6 files changed, 46 insertions, 3 deletions
diff --git a/include/Config.hpp b/include/Config.hpp
index 02f1634..c61ca10 100644
--- a/include/Config.hpp
+++ b/include/Config.hpp
@@ -40,6 +40,7 @@ namespace gsr {
struct MainConfig {
int32_t config_file_version = 0;
bool software_encoding_warning_shown = false;
+ std::string tint_color;
};
struct YoutubeStreamConfig {
diff --git a/include/Theme.hpp b/include/Theme.hpp
index 23bcbb7..185bcdc 100644
--- a/include/Theme.hpp
+++ b/include/Theme.hpp
@@ -8,6 +8,7 @@
#include <string>
namespace gsr {
+ struct Config;
struct GsrInfo;
struct Theme {
@@ -26,6 +27,7 @@ namespace gsr {
mgl::Texture combobox_arrow_texture;
mgl::Texture settings_texture;
+ mgl::Texture settings_small_texture;
mgl::Texture folder_texture;
mgl::Texture up_arrow_texture;
mgl::Texture replay_button_texture;
@@ -56,7 +58,7 @@ namespace gsr {
mgl::Color text_color = mgl::Color(255, 255, 255);
};
- bool init_color_theme(const GsrInfo &gsr_info);
+ bool init_color_theme(const Config &config, const GsrInfo &gsr_info);
void deinit_color_theme();
ColorTheme& get_color_theme();
} \ No newline at end of file
diff --git a/include/gui/Button.hpp b/include/gui/Button.hpp
index bc1dd94..eb68e99 100644
--- a/include/gui/Button.hpp
+++ b/include/gui/Button.hpp
@@ -5,6 +5,7 @@
#include <mglpp/graphics/Color.hpp>
#include <mglpp/graphics/Text.hpp>
+#include <mglpp/graphics/Sprite.hpp>
namespace gsr {
class Button : public Widget {
@@ -20,15 +21,21 @@ namespace gsr {
mgl::vec2f get_size() override;
void set_border_scale(float scale);
+ void set_bg_hover_color(mgl::Color color);
+ void set_icon(mgl::Texture *texture);
const std::string& get_text() const;
void set_text(std::string str);
std::function<void()> on_click;
private:
+ void scale_sprite_to_button_size();
+ private:
mgl::vec2f size;
mgl::Color bg_color;
+ mgl::Color bg_hover_color;
mgl::Text text;
+ mgl::Sprite sprite;
float border_scale = 0.0015f;
};
} \ No newline at end of file
diff --git a/include/gui/GlobalSettingsPage.hpp b/include/gui/GlobalSettingsPage.hpp
new file mode 100644
index 0000000..cd4a50c
--- /dev/null
+++ b/include/gui/GlobalSettingsPage.hpp
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "StaticPage.hpp"
+#include "../GsrInfo.hpp"
+#include "../Config.hpp"
+
+namespace gsr {
+ class GsrPage;
+ class PageStack;
+ class ScrollablePage;
+ class Subsection;
+ class RadioButton;
+
+ class GlobalSettingsPage : public StaticPage {
+ public:
+ GlobalSettingsPage(const GsrInfo *gsr_info, Config &config, PageStack *page_stack);
+ GlobalSettingsPage(const GlobalSettingsPage&) = delete;
+ GlobalSettingsPage& operator=(const GlobalSettingsPage&) = delete;
+
+ void load();
+ void save();
+ void on_navigate_away_from_page() override;
+ private:
+ std::unique_ptr<Subsection> create_appearance_subsection(ScrollablePage *parent_page);
+ void add_widgets();
+ private:
+ Config &config;
+ const GsrInfo *gsr_info = nullptr;
+
+ GsrPage *content_page_ptr = nullptr;
+ PageStack *page_stack = nullptr;
+ RadioButton *tint_color_radio_button_ptr = nullptr;
+ };
+} \ No newline at end of file
diff --git a/include/gui/SettingsPage.hpp b/include/gui/SettingsPage.hpp
index b115d78..981c99a 100644
--- a/include/gui/SettingsPage.hpp
+++ b/include/gui/SettingsPage.hpp
@@ -181,7 +181,5 @@ namespace gsr {
RadioButton *turn_on_replay_automatically_mode_ptr = nullptr;
PageStack *page_stack = nullptr;
-
- mgl::Text settings_title_text;
};
} \ No newline at end of file
diff --git a/include/gui/Utils.hpp b/include/gui/Utils.hpp
index 6963bc5..35b2bb7 100644
--- a/include/gui/Utils.hpp
+++ b/include/gui/Utils.hpp
@@ -15,4 +15,5 @@ namespace gsr {
void draw_rectangle_outline(mgl::Window &window, mgl::vec2f pos, mgl::vec2f size, mgl::Color color, float border_size);
double get_frame_delta_seconds();
void set_frame_delta_seconds(double frame_delta);
+ mgl::vec2f scale_keep_aspect_ratio(mgl::vec2f from, mgl::vec2f to);
} \ No newline at end of file