From f38661593795e51e45e2dc2ead8a7bf897d226f6 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Mon, 9 Dec 2024 16:29:36 +0100 Subject: [PATCH] Start on global settings, add tint color setting --- images/settings_small.png | Bin 0 -> 1903 bytes include/Config.hpp | 1 + include/Theme.hpp | 4 +- include/gui/Button.hpp | 7 +++ include/gui/GlobalSettingsPage.hpp | 34 ++++++++++++ include/gui/SettingsPage.hpp | 2 - include/gui/Utils.hpp | 1 + meson.build | 1 + src/Config.cpp | 1 + src/Overlay.cpp | 19 ++++++- src/Theme.cpp | 48 ++++++++++------- src/gui/Button.cpp | 44 +++++++++++++-- src/gui/GlobalSettingsPage.cpp | 83 +++++++++++++++++++++++++++++ src/gui/SettingsPage.cpp | 3 +- src/gui/Utils.cpp | 17 ++++++ 15 files changed, 237 insertions(+), 28 deletions(-) create mode 100644 images/settings_small.png create mode 100644 include/gui/GlobalSettingsPage.hpp create mode 100644 src/gui/GlobalSettingsPage.cpp diff --git a/images/settings_small.png b/images/settings_small.png new file mode 100644 index 0000000000000000000000000000000000000000..30534e63ea94668bd0165b5bc90b127d7b196156 GIT binary patch literal 1903 zcmV-#2ax!QP)fUngb&~bgNZH-5;dYLSm;6!tw|Fq5mJIdkakgt&_&;y8P92dr=DK# zymx2bOrNj4$>~hz-FyDsGv}Op?i~}9+>#^-j4^V*mM%{b3==%VkI;=f{6g>gan7V@;VB5SFNekltVByhgAQw0vf>g1$Va1{|gFS@oSw<*bC6n3;1qD(R2w8c)Gp zidds@x#;jSwi3;kI9DGB8fFl@!U7XSfJDEama~%ne1ETv3AzUy72ve#%=-wNFS~y( z3((pHQhqPF{|i8Vk)GG#sS_xK|FG#t^m`o<;CU!I5vE!+gTC`)3CB&Qqa31Go>`b= z!+iCCuLOKG(BGt4sh7#C5Y|WVA;A^ptR@H!sxeh{Un3YL7)ReY$=+nlIB?ZcXdMJE z(yoBlK1+to!b=DnBp9<8(*m8u3~=8K1RoGgC&jmE;NAdQ93ehx!WZ*AXvva!=4(p3 za|ln;bnO0|;3&bABi6Uu>>S|^!P}teq7#8vvC>*IOE3;4@H@*Z@RcUCU3^_7*h4a171>f10LQ|um*7W&CkYxJ;WAc^tL)@m6k$B_1L1uF zPVzp&W0DpIC3$%Z!q+`>g;0l{lABSR~SR8|O2vM{!SIhAD^7F2Bpp@_+x zN)Vn$GiQTp?rhrzjx+?i-*Lc}&J-$k3zY3Y`||@{sgw zvtyarjNq%5^%PQEwQ#=XX$8Xf=Cnu`sIrl)0H2_LUmws z*taH^u_h^een&$eRTBa<138y$-V~t&WfAz}Nkr zR^VzZ*<^clE`>YFATOK=gw-rGSxp}*26M)aV#1?TRddhZ{RUo3C|;7*RIJ5vY8GPI%aYzK({R`q2klg%~5&()^~vS^*Mcj zZeyZ=zjGp!{+r;K%rZDZp|Pn=o>}I1MFE%aE=4(gz;kd+@iI6;q48`^9}r>8CBpNk zPK4rBn+Soxq1BiQ+l!&c9gCqoD_}7+rWQkArY(k6<#M%`{h1+_UkqZT%@Il8T5o1@C< zjOHwnHM52&V|Ljnh<3f%CW*ac65}1&9{3+@^esbWIUrGFokGqzY=dlZGX+RnTh@Xu z$aikIh}P><5HUy&z7768snP9C{LnX$&Gy?Pra`X(rQG#hp z5ph8#tOcI}tuy#Pa`08hZ_N8HeM&S>HkkFW^zjl8OCPrmOP_3USbAfoEYP(e!Zq!< z`~f?MzIGSZk5Fa{ zt&*6gCBpT9ryZ7ZOfKPFN^sTsq(-M#bgI87Xh>yaafX@aF+)l~!CC^kvXI6!zto8d@ zjVp~W`KGB8TVqYb7iQ)b!Og(`{I7&H9&-ygO3O$~Q-B;yMosPnXjLsCHAKoPx$g;# p4ZHFK>TdaX+AN16{?DJ!{{!25im=|4iOK)~002ovPDHLkV1kJ+dNcq4 literal 0 HcmV?d00001 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 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 #include +#include 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 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 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 diff --git a/meson.build b/meson.build index 324295a..3b21a93 100644 --- a/meson.build +++ b/meson.build @@ -27,6 +27,7 @@ src = [ 'src/gui/CustomRendererWidget.cpp', 'src/gui/FileChooser.cpp', 'src/gui/SettingsPage.cpp', + 'src/gui/GlobalSettingsPage.cpp', 'src/gui/GsrPage.cpp', 'src/gui/Subsection.cpp', 'src/Utils.cpp', diff --git a/src/Config.cpp b/src/Config.cpp index 2263df7..4deaaf4 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -49,6 +49,7 @@ namespace gsr { return { {"main.config_file_version", &config.main_config.config_file_version}, {"main.software_encoding_warning_shown", &config.main_config.software_encoding_warning_shown}, + {"main.tint_color", &config.main_config.tint_color}, {"streaming.record_options.record_area_option", &config.streaming_config.record_options.record_area_option}, {"streaming.record_options.record_area_width", &config.streaming_config.record_options.record_area_width}, diff --git a/src/Overlay.cpp b/src/Overlay.cpp index 555c1d4..e10b1e4 100644 --- a/src/Overlay.cpp +++ b/src/Overlay.cpp @@ -7,8 +7,10 @@ #include "../include/gui/DropdownButton.hpp" #include "../include/gui/CustomRendererWidget.hpp" #include "../include/gui/SettingsPage.hpp" +#include "../include/gui/GlobalSettingsPage.hpp" #include "../include/gui/Utils.hpp" #include "../include/gui/PageStack.hpp" +#include "../include/gui/GsrPage.hpp" #include "../include/WindowUtils.hpp" #include "../include/GlobalHotkeys.hpp" @@ -420,7 +422,7 @@ namespace gsr { if(new_config) config = std::move(new_config.value()); - init_color_theme(this->gsr_info); + init_color_theme(config, this->gsr_info); power_supply_online_filepath = get_power_supply_online_filepath(); @@ -863,6 +865,7 @@ namespace gsr { const int button_width = button_height; auto main_buttons_list = std::make_unique(List::Orientation::HORIZONTAL); + List * main_buttons_list_ptr = main_buttons_list.get(); main_buttons_list->set_spacing(0.0f); { auto button = std::make_unique(&get_theme().title_font, &get_theme().body_font, "Instant Replay", "Off", &get_theme().replay_button_texture, @@ -928,6 +931,20 @@ namespace gsr { main_buttons_list->set_position((mgl::vec2f(window_size.x * 0.5f, window_size.y * 0.25f) - main_buttons_list_size * 0.5f).floor()); front_page_ptr->add_widget(std::move(main_buttons_list)); + { + const mgl::vec2f main_buttons_size = main_buttons_list_ptr->get_size(); + const int settings_button_size = main_buttons_size.y * 0.2f; + auto button = std::make_unique