From dc70bd27f217413bbda33b4092a3a52a6f1905d5 Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Tue, 18 Mar 2025 19:13:16 +0100
Subject: Add controller button icons in hotkeys, separate keyboard hotkeys and
controller hotkeys
---
include/gui/GlobalSettingsPage.hpp | 3 ++-
include/gui/Image.hpp | 29 +++++++++++++++++++++++++++++
include/gui/Utils.hpp | 4 +---
3 files changed, 32 insertions(+), 4 deletions(-)
create mode 100644 include/gui/Image.hpp
(limited to 'include/gui')
diff --git a/include/gui/GlobalSettingsPage.hpp b/include/gui/GlobalSettingsPage.hpp
index d0a0336..c261ab6 100644
--- a/include/gui/GlobalSettingsPage.hpp
+++ b/include/gui/GlobalSettingsPage.hpp
@@ -59,7 +59,8 @@ namespace gsr {
std::unique_ptr<List> create_stream_hotkey_options();
std::unique_ptr<List> create_screenshot_hotkey_options();
std::unique_ptr<List> create_hotkey_control_buttons();
- std::unique_ptr<Subsection> create_hotkey_subsection(ScrollablePage *parent_page);
+ std::unique_ptr<Subsection> create_keyboard_hotkey_subsection(ScrollablePage *parent_page);
+ std::unique_ptr<Subsection> create_controller_hotkey_subsection(ScrollablePage *parent_page);
std::unique_ptr<Button> create_exit_program_button();
std::unique_ptr<Button> create_go_back_to_old_ui_button();
std::unique_ptr<Subsection> create_application_options_subsection(ScrollablePage *parent_page);
diff --git a/include/gui/Image.hpp b/include/gui/Image.hpp
new file mode 100644
index 0000000..d72c5c1
--- /dev/null
+++ b/include/gui/Image.hpp
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "Widget.hpp"
+
+#include <mglpp/graphics/Sprite.hpp>
+
+namespace gsr {
+ class Image : public Widget {
+ public:
+ enum class ScaleBehavior {
+ SCALE,
+ CLAMP
+ };
+
+ // Set size to {0.0f, 0.0f} for no limit. The image is scaled to the size while keeping its aspect ratio
+ Image(mgl::Texture *texture, mgl::vec2f size, ScaleBehavior scale_behavior);
+ Image(const Image&) = delete;
+ Image& operator=(const Image&) = delete;
+
+ bool on_event(mgl::Event &event, mgl::Window &window, mgl::vec2f offset) override;
+ void draw(mgl::Window &window, mgl::vec2f offset) override;
+
+ mgl::vec2f get_size() override;
+ private:
+ mgl::Sprite sprite;
+ mgl::vec2f size;
+ ScaleBehavior scale_behavior;
+ };
+}
\ No newline at end of file
diff --git a/include/gui/Utils.hpp b/include/gui/Utils.hpp
index 35b2bb7..542e4ea 100644
--- a/include/gui/Utils.hpp
+++ b/include/gui/Utils.hpp
@@ -3,9 +3,6 @@
#include <mglpp/system/vec.hpp>
#include <mglpp/graphics/Color.hpp>
-#include <functional>
-#include <string_view>
-
namespace mgl {
class Window;
}
@@ -16,4 +13,5 @@ namespace gsr {
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);
+ mgl::vec2f clamp_keep_aspect_ratio(mgl::vec2f from, mgl::vec2f to);
}
\ No newline at end of file
--
cgit v1.2.3-70-g09d2