summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-06-29 12:22:57 +0200
committerGitHub <noreply@github.com>2019-06-29 12:22:57 +0200
commitba6b0dc38dc9d3eae4b1b2bee240ac5a0b054f02 (patch)
treefaf3378ab6fdd5bfdb52a0bb62df9d8588278378
parentc49ba7de0c35e0d97815382ad209c3075073f7fa (diff)
parentfacafeb19a18fc16263c80d20d60e458a1a59516 (diff)
Merge pull request #30174 from LikeLakers2/resourcepropertyeditor-selection-bugfix
Fix an EditorPropertyResource bug where clicking on the flat buttons …
-rw-r--r--editor/editor_properties.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp
index 8e4ec47435..c8bcce6e55 100644
--- a/editor/editor_properties.cpp
+++ b/editor/editor_properties.cpp
@@ -2808,6 +2808,7 @@ EditorPropertyResource::EditorPropertyResource() {
assign->set_drag_forwarding(this);
assign->connect("draw", this, "_button_draw");
hbc->add_child(assign);
+ add_focusable(assign);
preview = memnew(TextureRect);
preview->set_expand(true);
@@ -2828,6 +2829,7 @@ EditorPropertyResource::EditorPropertyResource() {
edit->connect("pressed", this, "_update_menu");
hbc->add_child(edit);
edit->connect("gui_input", this, "_button_input");
+ add_focusable(edit);
file = NULL;
scene_tree = NULL;