Ver Fonte

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).
Hugo Locurcio há 10 meses atrás
pai
commit
567db2ecb2
1 ficheiros alterados com 4 adições e 13 exclusões
  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_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));