summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-04-25 13:31:33 +0200
committerGitHub <noreply@github.com>2019-04-25 13:31:33 +0200
commit8b3eb59d663d21adde7fabcb2cf249acb7fab1ef (patch)
tree5b0e7f50491c9bd7ce7a13cc8a02222facb865a3
parentbfd2ad00593f44c5edcd88a8cc66611693b89e5f (diff)
parentd8de9cc20fe08092beb8b346779a78e8f6bc9e8e (diff)
Merge pull request #28340 from guilhermefelipecgs/fix_connection_dialog
Small fixes to connection dialog
-rw-r--r--editor/connections_dialog.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp
index 685c5de76c..03a71f3248 100644
--- a/editor/connections_dialog.cpp
+++ b/editor/connections_dialog.cpp
@@ -141,6 +141,9 @@ void ConnectDialog::_tree_node_selected() {
Node *current = tree->get_selected();
+ if (!current)
+ return;
+
dst_path = source->get_path_to(current);
get_ok()->set_disabled(false);
}
@@ -309,6 +312,7 @@ void ConnectDialog::popup_dialog(const String &p_for_signal, bool p_advanced) {
advanced->set_pressed(p_advanced);
from_signal->set_text(p_for_signal);
error_label->add_color_override("font_color", get_color("error_color", "Editor"));
+ vbc_right->set_visible(p_advanced);
if (p_advanced) {
@@ -330,7 +334,7 @@ void ConnectDialog::popup_dialog(const String &p_for_signal, bool p_advanced) {
}
void ConnectDialog::_advanced_pressed() {
- vbc_right->set_visible(advanced->is_pressed());
+
popup_dialog(from_signal->get_text(), advanced->is_pressed());
}
@@ -414,7 +418,7 @@ ConnectDialog::ConnectDialog() {
advanced = memnew(CheckBox);
dstm_hb->add_child(advanced);
- advanced->set_text(TTR("Advanced.."));
+ advanced->set_text(TTR("Advanced..."));
advanced->connect("pressed", this, "_advanced_pressed");
/*