diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-03 17:35:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-03 17:35:01 +0100 |
| commit | e684df08fced890a5d15f08b85c355c55b14e6be (patch) | |
| tree | f188238ed3ccfd3cf9ea564d584b122391835834 /scene/gui | |
| parent | c1b0800784fd2538d0a0f32cbc2310de667d47f7 (diff) | |
| parent | 8eb2eeae0f0d204f697ef5c0a1bfdcd18d8cb723 (diff) | |
Merge pull request #33286 from groud/fix_tree_edit_rect
Fixes the edit rect in TreeItems
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/tree.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index c9d1295557..2c38676c83 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -1234,7 +1234,7 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2 } } - if (select_mode != SELECT_ROW && (p_item->cells[i].selected || selected_item == p_item)) { + if ((select_mode == SELECT_ROW && selected_item == p_item) || p_item->cells[i].selected) { Rect2i r(cell_rect.position, cell_rect.size); if (p_item->cells[i].text.size() > 0) { @@ -2765,7 +2765,6 @@ bool Tree::edit_selected() { return false; Rect2 rect = s->get_meta("__focus_rect"); - popup_edited_item = s; popup_edited_item_col = col; |