Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 11:32:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Don't swap Advanced Import Settings button position based on Swap OK Cancel

Browse Source 
The "Advanced..." and "Reimport" buttons are not OK/Cancel buttons,
so they shouldn't be swapped according to the editor setting (which
itself is determined depending on the OS by default).
This commit is contained in:
Hugo Locurcio 2024-10-18 23:28:11 +02:00
parent 80f0b33313
commit 567db2ecb2
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
editor/import_dock.cpp
View File

@ -790,23 +790,14 @@ ImportDock::ImportDock() {
import->set_text(TTR("Reimport")); import->set_text(TTR("Reimport"));
import->set_disabled(true); import->set_disabled(true);
import->connect(SceneStringName(pressed), callable_mp(this, &ImportDock::_reimport_pressed)); import->connect(SceneStringName(pressed), callable_mp(this, &ImportDock::_reimport_pressed));
if (!DisplayServer::get_singleton()->get_swap_cancel_ok()) { advanced_spacer = hb->add_spacer();
advanced_spacer = hb->add_spacer(); advanced = memnew(Button);
advanced = memnew(Button); advanced->set_text(TTR("Advanced..."));
advanced->set_text(TTR("Advanced...")); hb->add_child(advanced);
hb->add_child(advanced);
}
hb->add_spacer(); hb->add_spacer();
hb->add_child(import); hb->add_child(import);
hb->add_spacer(); hb->add_spacer();
if (DisplayServer::get_singleton()->get_swap_cancel_ok()) {
advanced = memnew(Button);
advanced->set_text(TTR("Advanced..."));
hb->add_child(advanced);
advanced_spacer = hb->add_spacer();
}
advanced->hide(); advanced->hide();
advanced_spacer->hide(); advanced_spacer->hide();
advanced->connect(SceneStringName(pressed), callable_mp(this, &ImportDock::_advanced_options)); advanced->connect(SceneStringName(pressed), callable_mp(this, &ImportDock::_advanced_options));