mirror of
https://repo.dec05eba.com/gpu-screen-recorder-ui
synced 2026-05-06 06:50:44 +09:00
Flatpak: disable hotkey section
This commit is contained in:
2
TODO
2
TODO
@@ -106,3 +106,5 @@ Keyboard leds get turned off when stopping gsr-global-hotkeys (for example numlo
|
|||||||
|
|
||||||
Implement hotkey changing in global settings by getting mgl key events. During this time gsr-global-hotkey would either need to be paused or add code in the callback handler for the existing hotkeys since they are grabbing hotkeys.
|
Implement hotkey changing in global settings by getting mgl key events. During this time gsr-global-hotkey would either need to be paused or add code in the callback handler for the existing hotkeys since they are grabbing hotkeys.
|
||||||
This can only be done after gsr-global-hotkeys properly handle different keyboard layouts to make sure mgl keys match gsr-global-hotkey keys.
|
This can only be done after gsr-global-hotkeys properly handle different keyboard layouts to make sure mgl keys match gsr-global-hotkey keys.
|
||||||
|
|
||||||
|
Re-enable hotkey enable/disable section for flatpak.
|
||||||
@@ -137,13 +137,15 @@ namespace gsr {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void GlobalSettingsPage::add_widgets() {
|
void GlobalSettingsPage::add_widgets() {
|
||||||
|
const bool inside_flatpak = getenv("FLATPAK_ID") != NULL;
|
||||||
auto scrollable_page = std::make_unique<ScrollablePage>(content_page_ptr->get_inner_size());
|
auto scrollable_page = std::make_unique<ScrollablePage>(content_page_ptr->get_inner_size());
|
||||||
|
|
||||||
auto settings_list = std::make_unique<List>(List::Orientation::VERTICAL);
|
auto settings_list = std::make_unique<List>(List::Orientation::VERTICAL);
|
||||||
settings_list->set_spacing(0.018f);
|
settings_list->set_spacing(0.018f);
|
||||||
settings_list->add_widget(create_appearance_subsection(scrollable_page.get()));
|
settings_list->add_widget(create_appearance_subsection(scrollable_page.get()));
|
||||||
settings_list->add_widget(create_startup_subsection(scrollable_page.get()));
|
settings_list->add_widget(create_startup_subsection(scrollable_page.get()));
|
||||||
settings_list->add_widget(create_hotkey_subsection(scrollable_page.get()));
|
if(!inside_flatpak)
|
||||||
|
settings_list->add_widget(create_hotkey_subsection(scrollable_page.get()));
|
||||||
settings_list->add_widget(create_application_options_subsection(scrollable_page.get()));
|
settings_list->add_widget(create_application_options_subsection(scrollable_page.get()));
|
||||||
scrollable_page->add_widget(std::move(settings_list));
|
scrollable_page->add_widget(std::move(settings_list));
|
||||||
|
|
||||||
@@ -165,12 +167,14 @@ namespace gsr {
|
|||||||
const int exit_status = exec_program_on_host_get_stdout(args, stdout_str);
|
const int exit_status = exec_program_on_host_get_stdout(args, stdout_str);
|
||||||
startup_radio_button_ptr->set_selected_item(exit_status == 0 ? "start_on_system_startup" : "dont_start_on_system_startup", false, false);
|
startup_radio_button_ptr->set_selected_item(exit_status == 0 ? "start_on_system_startup" : "dont_start_on_system_startup", false, false);
|
||||||
|
|
||||||
enable_hotkeys_radio_button_ptr->set_selected_item(config.main_config.enable_hotkeys ? "enable_hotkeys" : "disable_hotkeys", false, false);
|
if(enable_hotkeys_radio_button_ptr)
|
||||||
|
enable_hotkeys_radio_button_ptr->set_selected_item(config.main_config.enable_hotkeys ? "enable_hotkeys" : "disable_hotkeys", false, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GlobalSettingsPage::save() {
|
void GlobalSettingsPage::save() {
|
||||||
config.main_config.tint_color = tint_color_radio_button_ptr->get_selected_id();
|
config.main_config.tint_color = tint_color_radio_button_ptr->get_selected_id();
|
||||||
config.main_config.enable_hotkeys = enable_hotkeys_radio_button_ptr->get_selected_id() == "enable_hotkeys";
|
if(enable_hotkeys_radio_button_ptr)
|
||||||
|
config.main_config.enable_hotkeys = enable_hotkeys_radio_button_ptr->get_selected_id() == "enable_hotkeys";
|
||||||
save_config(config);
|
save_config(config);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user