Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Revert "Tree and PropertyEditor confirm value change on focus loss"

Browse source
This commit is contained in:
Juan Linietsky 2016-01-23 11:20:54 -03:00
parent dfbc2dce17
commit 579ec65d36
4 changed files with 107 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

25
scene/gui/tree.cpp
View file

@ -1723,7 +1723,6 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_
void Tree::text_editor_enter(String p_text) {
text_changed=false;
text_editor->hide();
value_editor->hide();
@ -1762,22 +1761,6 @@ void Tree::text_editor_enter(String p_text) {
}
void Tree::text_editor_changed(String p_text) {
text_changed=true;
}
void Tree::text_editor_hide() {
if (!text_changed)
return;
if (Input::get_singleton()->is_key_pressed(KEY_ESCAPE))
return;
text_editor_enter(text_editor->get_text());
}
void Tree::value_editor_changed(double p_value) {
if (updating_value_editor) {
@ -2367,8 +2350,6 @@ bool Tree::edit_selected() {
} else if (c.mode==TreeItem::CELL_MODE_STRING || c.mode==TreeItem::CELL_MODE_RANGE) {
text_changed=false;
Point2i textedpos=get_global_pos() + rect.pos;
text_editor->set_pos( textedpos );
text_editor->set_size( rect.size);
@ -3204,8 +3185,6 @@ void Tree::_bind_methods() {
ObjectTypeDB::bind_method(_MD("_input_event"),&Tree::_input_event);
ObjectTypeDB::bind_method(_MD("_popup_select"),&Tree::popup_select);
ObjectTypeDB::bind_method(_MD("_text_editor_enter"),&Tree::text_editor_enter);
ObjectTypeDB::bind_method(_MD("_text_editor_changed"),&Tree::text_editor_changed);
ObjectTypeDB::bind_method(_MD("_text_editor_hide"),&Tree::text_editor_hide);
ObjectTypeDB::bind_method(_MD("_value_editor_changed"),&Tree::value_editor_changed);
ObjectTypeDB::bind_method(_MD("_scroll_moved"),&Tree::_scroll_moved);
@ -3304,8 +3283,6 @@ Tree::Tree() {
h_scroll->connect("value_changed", this,"_scroll_moved");
v_scroll->connect("value_changed", this,"_scroll_moved");
text_editor->connect("text_entered", this,"_text_editor_enter");
text_editor->connect("text_changed",this,"_text_editor_changed");
text_editor->connect("hide",this,"_text_editor_hide");
popup_menu->connect("item_pressed", this,"_popup_select");
value_editor->connect("value_changed", this,"_value_editor_changed");
@ -3339,8 +3316,6 @@ Tree::Tree() {
hide_folding=false;
text_changed=false;
}