Skip to content

Improve connection bind deletion #108900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KoBeWi wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −13
Open

Improve connection bind deletion #108900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions editor/scene/connections_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,8 @@ void ConnectDialog::_add_bind() {
/*
* Remove parameter bind from connection.
*/
void ConnectDialog::_remove_bind() {
String st = bind_editor->get_selected_path();
if (st.is_empty()) {
return;
}
int idx = st.get_slicec('/', 1).to_int() - 1;
void ConnectDialog::_remove_bind(const String &p_bind) {
int idx = p_bind.get_slicec('/', 1).to_int() - 1;

ERR_FAIL_INDEX(idx, cdbinds->params.size());
cdbinds->params.remove_at(idx);
Expand Down Expand Up @@ -895,18 +891,14 @@ ConnectDialog::ConnectDialog() {
add_bind->connect(SceneStringName(pressed), callable_mp(this, &ConnectDialog::_add_bind));
bind_controls.push_back(add_bind);

Button *del_bind = memnew(Button);
del_bind->set_text(TTR("Remove"));
add_bind_hb->add_child(del_bind);
del_bind->connect(SceneStringName(pressed), callable_mp(this, &ConnectDialog::_remove_bind));
bind_controls.push_back(del_bind);

vbc_right->add_margin_child(TTR("Add Extra Call Argument:"), add_bind_hb);

bind_editor = memnew(EditorInspector);
bind_editor->set_accessibility_name(TTRC("Extra Call Arguments:"));
bind_editor->set_theme_type_variation("ScrollContainerSecondary");
bind_editor->set_use_deletable_properties(true);
bind_controls.push_back(bind_editor);
bind_editor->connect("property_deleted", callable_mp(this, &ConnectDialog::_remove_bind));

vbc_right->add_margin_child(TTR("Extra Call Arguments:"), bind_editor, true);

Expand Down
2 changes: 1 addition & 1 deletion editor/scene/connections_dialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ class ConnectDialog : public ConfirmationDialog {

void _unbind_count_changed(double p_count);
void _add_bind();
void _remove_bind();
void _remove_bind(const String &p_bind);
void _advanced_pressed();
void _update_ok_enabled();
void _update_warning_label();
Expand Down
Loading