mirror of
https://github.com/godotengine/godot.git
synced 2024-10-22 21:21:53 +00:00
Merge 567db2ecb2
into 533c616cb8
This commit is contained in:
commit
41f9c859f3
|
@ -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));
|
||||
|
|
Loading…
Reference in New Issue
Block a user