diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-11 10:42:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-11 10:42:29 +0200 |
| commit | 066fb4d5f9417afffac27a0eb8690f1301cad382 (patch) | |
| tree | 832ffbbdcf7a520ea13be3aa43c1ab312a46b5e9 /scene | |
| parent | bed66afee4b495e0eaaabdf481c91e75b096f27d (diff) | |
| parent | 9d593481f6e66515e93c659c2e9fd1fb05962859 (diff) | |
Merge pull request #10238 from Hinsbart/resource_rmb
Inspector: Right click on resource opens sub-menu.
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/tree.cpp | 13 | ||||
| -rw-r--r-- | scene/gui/tree.h | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 93757304aa..8e732b3826 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -1856,13 +1856,14 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, bool bring_up_editor = false; + custom_popup_rect = Rect2i(get_global_position() + Point2i(col_ofs, _get_title_button_height() + y_ofs + item_h - cache.offset.y), Size2(get_column_width(col), item_h)); + if (on_arrow || !p_item->cells[col].custom_button) { - custom_popup_rect = Rect2i(get_global_position() + Point2i(col_ofs, _get_title_button_height() + y_ofs + item_h - cache.offset.y), Size2(get_column_width(col), item_h)); emit_signal("custom_popup_edited", ((bool)(x >= (col_width - item_h / 2)))); } if (!p_item->cells[col].custom_button || !on_arrow) { - item_edited(col, p_item); + item_edited(col, p_item, p_button == BUTTON_LEFT); } click_handled = true; return -1; @@ -2925,11 +2926,14 @@ TreeItem *Tree::get_last_item() { return last; } -void Tree::item_edited(int p_column, TreeItem *p_item) { +void Tree::item_edited(int p_column, TreeItem *p_item, bool p_lmb) { edited_item = p_item; edited_col = p_column; - emit_signal("item_edited"); + if (p_lmb) + emit_signal("item_edited"); + else + emit_signal("item_rmb_edited"); } void Tree::item_changed(int p_column, TreeItem *p_item) { @@ -3645,6 +3649,7 @@ void Tree::_bind_methods() { ADD_SIGNAL(MethodInfo("item_rmb_selected", PropertyInfo(Variant::VECTOR2, "pos"))); ADD_SIGNAL(MethodInfo("empty_tree_rmb_selected", PropertyInfo(Variant::VECTOR2, "pos"))); ADD_SIGNAL(MethodInfo("item_edited")); + ADD_SIGNAL(MethodInfo("item_rmb_edited")); ADD_SIGNAL(MethodInfo("item_custom_button_pressed")); ADD_SIGNAL(MethodInfo("item_double_clicked")); ADD_SIGNAL(MethodInfo("item_collapsed", PropertyInfo(Variant::OBJECT, "item"))); diff --git a/scene/gui/tree.h b/scene/gui/tree.h index 694f91f9a6..d3715c3c43 100644 --- a/scene/gui/tree.h +++ b/scene/gui/tree.h @@ -381,7 +381,7 @@ private: Size2 get_minimum_size() const; - void item_edited(int p_column, TreeItem *p_item); + void item_edited(int p_column, TreeItem *p_item, bool p_lmb = true); void item_changed(int p_column, TreeItem *p_item); void item_selected(int p_column, TreeItem *p_item); void item_deselected(int p_column, TreeItem *p_item); |