summaryrefslogtreecommitdiff
path: root/scene/gui
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2015-12-13 10:10:33 +0100
committerRémi Verschelde <remi@verschelde.fr>2015-12-13 10:10:33 +0100
commit4018ea63c76467a60aec308b610d2b9129fe449a (patch)
tree871aa181d13a0a4af69825a27da379d7228365d2 /scene/gui
parent75e88b8b9ef963d63dbba5aa314f2f91ef5af934 (diff)
parenta028840ea5cfc6ac4e80d99c4850ae3f10eeb353 (diff)
Merge pull request #3050 from eska014/fix-tree-cell-slider
Fix editor for TreeItem cells in range mode
Diffstat (limited to 'scene/gui')
-rw-r--r--scene/gui/tree.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
index ee7c0724e3..1b204cff65 100644
--- a/scene/gui/tree.cpp
+++ b/scene/gui/tree.cpp
@@ -1721,6 +1721,7 @@ void Tree::text_editor_enter(String p_text) {
text_editor->hide();
+ value_editor->hide();
if (!popup_edited_item)
return;
@@ -2167,18 +2168,9 @@ void Tree::_input_event(InputEvent p_event) {
range_drag_enabled=false;
Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
warp_mouse(range_drag_capture_pos);
- } else {
- text_editor->set_pos(pressing_item_rect.pos);
- text_editor->set_size(pressing_item_rect.size);
-
- text_editor->clear();
- text_editor->set_text( pressing_for_editor_text );
- text_editor->select_all();
+ } else
+ edit_selected();
- text_editor->show_modal();
- text_editor->grab_focus();
-
- }
pressing_for_editor=false;
}