diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Config.hpp | 1 | ||||
| -rw-r--r-- | include/GlobalHotkeysJoystick.hpp | 2 | ||||
| -rw-r--r-- | include/GsrInfo.hpp | 3 | ||||
| -rw-r--r-- | include/Overlay.hpp | 3 | ||||
| -rw-r--r-- | include/Theme.hpp | 1 | ||||
| -rw-r--r-- | include/gui/Button.hpp | 2 | ||||
| -rw-r--r-- | include/gui/GlobalSettingsPage.hpp | 3 |
7 files changed, 13 insertions, 2 deletions
diff --git a/include/Config.hpp b/include/Config.hpp index 1e2e9cb..0e8e4eb 100644 --- a/include/Config.hpp +++ b/include/Config.hpp @@ -126,6 +126,7 @@ namespace gsr { bool show_screenshot_saved_notifications = true; std::string save_directory; ConfigHotkey take_screenshot_hotkey; + ConfigHotkey take_screenshot_region_hotkey; }; struct Config { diff --git a/include/GlobalHotkeysJoystick.hpp b/include/GlobalHotkeysJoystick.hpp index 1effe3c..30a7689 100644 --- a/include/GlobalHotkeysJoystick.hpp +++ b/include/GlobalHotkeysJoystick.hpp @@ -24,6 +24,7 @@ namespace gsr { // take_screenshot // toggle_record // toggle_replay + // toggle_show bool bind_action(const std::string &id, GlobalHotkeyCallback callback) override; void poll_events() override; private: @@ -58,6 +59,7 @@ namespace gsr { bool take_screenshot = false; bool toggle_record = false; bool toggle_replay = false; + bool toggle_show = false; int hotplug_poll_index = -1; Hotplug hotplug; }; diff --git a/include/GsrInfo.hpp b/include/GsrInfo.hpp index b8f478c..156125b 100644 --- a/include/GsrInfo.hpp +++ b/include/GsrInfo.hpp @@ -69,7 +69,8 @@ namespace gsr { UNKNOWN, AMD, INTEL, - NVIDIA + NVIDIA, + BROADCOM }; struct GpuInfo { diff --git a/include/Overlay.hpp b/include/Overlay.hpp index 5ed7f51..d7b8af1 100644 --- a/include/Overlay.hpp +++ b/include/Overlay.hpp @@ -59,6 +59,7 @@ namespace gsr { void toggle_replay(); void save_replay(); void take_screenshot(); + void take_screenshot_region(); void show_notification(const char *str, double timeout_seconds, mgl::Color icon_color, mgl::Color bg_color, NotificationType notification_type); bool is_open() const; bool should_exit(std::string &reason) const; @@ -111,7 +112,7 @@ namespace gsr { bool on_press_start_replay(bool disable_notification, bool finished_region_selection); void on_press_start_record(bool finished_region_selection); void on_press_start_stream(bool finished_region_selection); - void on_press_take_screenshot(bool finished_region_selection); + void on_press_take_screenshot(bool finished_region_selection, bool force_region_capture); bool update_compositor_texture(const Monitor &monitor); void force_window_on_top(); diff --git a/include/Theme.hpp b/include/Theme.hpp index bda8dd4..4305072 100644 --- a/include/Theme.hpp +++ b/include/Theme.hpp @@ -44,6 +44,7 @@ namespace gsr { mgl::Texture screenshot_texture; mgl::Texture ps4_home_texture; + mgl::Texture ps4_options_texture; mgl::Texture ps4_dpad_up_texture; mgl::Texture ps4_dpad_down_texture; mgl::Texture ps4_dpad_left_texture; diff --git a/include/gui/Button.hpp b/include/gui/Button.hpp index 7070457..f412521 100644 --- a/include/gui/Button.hpp +++ b/include/gui/Button.hpp @@ -21,6 +21,7 @@ namespace gsr { mgl::vec2f get_size() override; void set_border_scale(float scale); + void set_icon_padding_scale(float scale); void set_bg_hover_color(mgl::Color color); void set_icon(mgl::Texture *texture); @@ -38,5 +39,6 @@ namespace gsr { mgl::Text text; mgl::Sprite sprite; float border_scale = 0.0015f; + float icon_padding_scale = 1.0f; }; }
\ No newline at end of file diff --git a/include/gui/GlobalSettingsPage.hpp b/include/gui/GlobalSettingsPage.hpp index c261ab6..5df5b9c 100644 --- a/include/gui/GlobalSettingsPage.hpp +++ b/include/gui/GlobalSettingsPage.hpp @@ -26,6 +26,7 @@ namespace gsr { RECORD_PAUSE_UNPAUSE, STREAM_START_STOP, TAKE_SCREENSHOT, + TAKE_SCREENSHOT_REGION, SHOW_HIDE }; @@ -58,6 +59,7 @@ namespace gsr { std::unique_ptr<List> create_record_hotkey_options(); std::unique_ptr<List> create_stream_hotkey_options(); std::unique_ptr<List> create_screenshot_hotkey_options(); + std::unique_ptr<List> create_screenshot_region_hotkey_options(); std::unique_ptr<List> create_hotkey_control_buttons(); std::unique_ptr<Subsection> create_keyboard_hotkey_subsection(ScrollablePage *parent_page); std::unique_ptr<Subsection> create_controller_hotkey_subsection(ScrollablePage *parent_page); @@ -91,6 +93,7 @@ namespace gsr { Button *pause_unpause_recording_button_ptr = nullptr; Button *start_stop_streaming_button_ptr = nullptr; Button *take_screenshot_button_ptr = nullptr; + Button *take_screenshot_region_button_ptr = nullptr; Button *show_hide_button_ptr = nullptr; ConfigHotkey configure_config_hotkey; |