Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #105314 from bruvzg/ac_set_sep

Browse source 
Add separate editor accessibility mode setting.
This commit is contained in:
Rémi Verschelde 2025-06-13 01:30:18 +02:00
commit fae09980bd
No known key found for this signature in database
GPG key ID: C3336907360768E1
4 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
main/main.cpp
View file

@ -2909,6 +2909,7 @@ Error Main::setup2(bool p_show_boot_logo) {
print_header(false);
#ifdef TOOLS_ENABLED
int accessibility_mode_editor = 0;
int tablet_driver_editor = -1;
if (editor || project_manager || cmdline_tool) {
OS::get_singleton()->benchmark_begin_measure("Startup", "Initialize Early Settings");
@ -2946,6 +2947,8 @@ Error Main::setup2(bool p_show_boot_logo) {
bool tablet_found = false;
bool ac_found = false;
if (editor) {
screen_property = "interface/editor/editor_screen";
} else if (project_manager) {
@ -2960,7 +2963,7 @@ Error Main::setup2(bool p_show_boot_logo) {
prefer_wayland_found = true;
}
while (!screen_found || !prefer_wayland_found || !tablet_found) {
while (!screen_found || !prefer_wayland_found || !tablet_found || !ac_found) {
assign = Variant();
next_tag.fields.clear();
next_tag.name = String();
@ -2979,7 +2982,10 @@ Error Main::setup2(bool p_show_boot_logo) {
restore_editor_window_layout = value.operator int() == EditorSettings::InitialScreen::INITIAL_SCREEN_AUTO;
}
}
if (assign == "interface/editor/expand_to_title") {
if (assign == "interface/accessibility/accessibility_support") {
accessibility_mode_editor = value;
ac_found = true;
} else if (assign == "interface/editor/expand_to_title") {
init_expand_to_title = value;
} else if (assign == "interface/editor/display_scale") {
init_display_scale = value;
@ -3154,7 +3160,15 @@ Error Main::setup2(bool p_show_boot_logo) {
#endif
if (!accessibility_mode_set) {
accessibility_mode = (DisplayServer::AccessibilityMode)GLOBAL_GET("accessibility/general/accessibility_support").operator int64_t();
#ifdef TOOLS_ENABLED
if (editor || project_manager || cmdline_tool) {
accessibility_mode = (DisplayServer::AccessibilityMode)accessibility_mode_editor;
} else {
#else
{
#endif
accessibility_mode = (DisplayServer::AccessibilityMode)GLOBAL_GET("accessibility/general/accessibility_support").operator int64_t();
}
}
DisplayServer::accessibility_set_mode(accessibility_mode);