From 567db2ecb2aa6fb4cacf1cc1e8a29676a45e7a12 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Fri, 18 Oct 2024 23:28:11 +0200 Subject: [PATCH] Don't swap Advanced Import Settings button position based on Swap OK Cancel 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). --- editor/import_dock.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/editor/import_dock.cpp b/editor/import_dock.cpp index 14065abf734..6c22a965ae5 100644 --- a/editor/import_dock.cpp +++ b/editor/import_dock.cpp @@ -790,23 +790,14 @@ ImportDock::ImportDock() { import->set_text(TTR("Reimport")); import->set_disabled(true); import->connect(SceneStringName(pressed), callable_mp(this, &ImportDock::_reimport_pressed)); - if (!DisplayServer::get_singleton()->get_swap_cancel_ok()) { - advanced_spacer = hb->add_spacer(); - advanced = memnew(Button); - advanced->set_text(TTR("Advanced...")); - hb->add_child(advanced); - } + advanced_spacer = hb->add_spacer(); + advanced = memnew(Button); + advanced->set_text(TTR("Advanced...")); + hb->add_child(advanced); hb->add_spacer(); hb->add_child(import); 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_spacer->hide(); advanced->connect(SceneStringName(pressed), callable_mp(this, &ImportDock::_advanced_options));