Browse Source

Merge pull request #98323 from Calinou/advanced-import-settings-button-no-swap-ok-cancel

Don't swap Advanced Import Settings button position based on Swap OK Cancel
Clay John 9 months ago
parent
commit
2a8869e0ac
1 changed files with 4 additions and 13 deletions
  1. 4 13
      editor/import_dock.cpp

+ 4 - 13
editor/import_dock.cpp

@@ -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 = 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_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));