diff options
| author | Juan Linietsky <juan@godotengine.org> | 2017-12-26 09:48:50 -0300 |
|---|---|---|
| committer | Juan Linietsky <juan@godotengine.org> | 2017-12-26 09:49:31 -0300 |
| commit | 4a2eef4ad801a3dc5c07a575e59b8f1eafa42c6e (patch) | |
| tree | 599bdfadc50bc5526d18633891bc86529b60ec6f /scene/gui | |
| parent | 37aab45091961e7c063e9c77d6c4835b0c14806a (diff) | |
Removed the InputEvent ID field, which was unused and can cause bugs.
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/tree.cpp | 6 | ||||
| -rw-r--r-- | scene/gui/tree.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 6879aa1ce7..51ad22e271 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -1775,7 +1775,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, bool case TreeItem::CELL_MODE_STRING: { //nothing in particular - if (select_mode == SELECT_MULTI && (get_tree()->get_last_event_id() == focus_in_id || !already_cursor)) { + if (select_mode == SELECT_MULTI && (get_tree()->get_event_count() == focus_in_id || !already_cursor)) { bring_up_editor = false; } @@ -1863,7 +1863,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, bool } else { editor_text = String::num(p_item->cells[col].val, Math::step_decimals(p_item->cells[col].step)); - if (select_mode == SELECT_MULTI && get_tree()->get_last_event_id() == focus_in_id) + if (select_mode == SELECT_MULTI && get_tree()->get_event_count() == focus_in_id) bring_up_editor = false; } } @@ -2786,7 +2786,7 @@ void Tree::_notification(int p_what) { if (p_what == NOTIFICATION_FOCUS_ENTER) { - focus_in_id = get_tree()->get_last_event_id(); + focus_in_id = get_tree()->get_event_count(); } if (p_what == NOTIFICATION_MOUSE_EXIT) { diff --git a/scene/gui/tree.h b/scene/gui/tree.h index 85c07e192b..b8d94bcffb 100644 --- a/scene/gui/tree.h +++ b/scene/gui/tree.h @@ -359,7 +359,7 @@ private: LineEdit *text_editor; HSlider *value_editor; bool updating_value_editor; - uint32_t focus_in_id; + int64_t focus_in_id; PopupMenu *popup_menu; Vector<ColumnInfo> columns; |