godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implemented right click on Tree control header

This commit is contained in:
derammo 2022-08-13 12:30:41 -04:00
parent ba0421f3d9
commit 0ba2e999df
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/classes/Tree.xml
View File

@ -351,10 +351,11 @@
Emitted when [method TreeItem.propagate_check] is called. Connect to this signal to process the items that are affected when [method TreeItem.propagate_check] is invoked. The order that the items affected will be processed is as follows: the item that invoked the method, children of that item, and finally parents of that item. Emitted when [method TreeItem.propagate_check] is called. Connect to this signal to process the items that are affected when [method TreeItem.propagate_check] is invoked. The order that the items affected will be processed is as follows: the item that invoked the method, children of that item, and finally parents of that item.
</description> </description>
</signal> </signal>
<signal name="column_title_pressed"> <signal name="column_title_clicked">
<param index="0" name="column" type="int" /> <param index="0" name="column" type="int" />
<param index="1" name="mouse_button_index" type="int" />
<description> <description>
Emitted when a column's title is pressed. Emitted when a column's title is clicked with either [constant MOUSE_BUTTON_LEFT] or [constant MOUSE_BUTTON_RIGHT].
</description> </description>
</signal> </signal>
<signal name="custom_item_clicked"> <signal name="custom_item_clicked">

16
scene/gui/tree.cpp
View File

@ -3340,7 +3340,8 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
bool rtl = is_layout_rtl(); bool rtl = is_layout_rtl();
if (!mb->is_pressed()) { if (!mb->is_pressed()) {
if (mb->get_button_index() == MouseButton::LEFT) { if (mb->get_button_index() == MouseButton::LEFT ||
mb->get_button_index() == MouseButton::RIGHT) {
Point2 pos = mb->get_position(); Point2 pos = mb->get_position();
if (rtl) { if (rtl) {
pos.x = get_size().width - pos.x; pos.x = get_size().width - pos.x;
@ -3354,14 +3355,16 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
int len = 0; int len = 0;
for (int i = 0; i < columns.size(); i++) { for (int i = 0; i < columns.size(); i++) {
len += get_column_width(i); len += get_column_width(i);
if (pos.x < len) { if (pos.x < static_cast<real_t>(len)) {
emit_signal(SNAME("column_title_pressed"), i); emit_signal(SNAME("column_title_clicked"), i, mb->get_button_index());
break; break;
} }
} }
} }
} }
}
if (mb->get_button_index() == MouseButton::LEFT) {
if (single_select_defer) { if (single_select_defer) {
select_single_item(single_select_defer, root, single_select_defer_column); select_single_item(single_select_defer, root, single_select_defer_column);
single_select_defer = nullptr; single_select_defer = nullptr;
@ -3449,20 +3452,17 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
pos.y -= _get_title_button_height(); pos.y -= _get_title_button_height();
if (pos.y < 0) { if (pos.y < 0) {
if (mb->get_button_index() == MouseButton::LEFT) {
pos.x += cache.offset.x; pos.x += cache.offset.x;
int len = 0; int len = 0;
for (int i = 0; i < columns.size(); i++) { for (int i = 0; i < columns.size(); i++) {
len += get_column_width(i); len += get_column_width(i);
if (pos.x < len) { if (pos.x < static_cast<real_t>(len)) {
cache.click_type = Cache::CLICK_TITLE; cache.click_type = Cache::CLICK_TITLE;
cache.click_index = i; cache.click_index = i;
//cache.click_id=;
update(); update();
break; break;
} }
} }
}
break; break;
} }
} }
@ -5027,7 +5027,7 @@ void Tree::_bind_methods() {
ADD_SIGNAL(MethodInfo("button_clicked", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "TreeItem"), PropertyInfo(Variant::INT, "column"), PropertyInfo(Variant::INT, "id"), PropertyInfo(Variant::INT, "mouse_button_index"))); ADD_SIGNAL(MethodInfo("button_clicked", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "TreeItem"), PropertyInfo(Variant::INT, "column"), PropertyInfo(Variant::INT, "id"), PropertyInfo(Variant::INT, "mouse_button_index")));
ADD_SIGNAL(MethodInfo("custom_popup_edited", PropertyInfo(Variant::BOOL, "arrow_clicked"))); ADD_SIGNAL(MethodInfo("custom_popup_edited", PropertyInfo(Variant::BOOL, "arrow_clicked")));
ADD_SIGNAL(MethodInfo("item_activated")); ADD_SIGNAL(MethodInfo("item_activated"));
ADD_SIGNAL(MethodInfo("column_title_pressed", PropertyInfo(Variant::INT, "column"))); ADD_SIGNAL(MethodInfo("column_title_clicked", PropertyInfo(Variant::INT, "column"), PropertyInfo(Variant::INT, "mouse_button_index")));
ADD_SIGNAL(MethodInfo("nothing_selected")); ADD_SIGNAL(MethodInfo("nothing_selected"));
BIND_ENUM_CONSTANT(SELECT_SINGLE); BIND_ENUM_CONSTANT(SELECT_SINGLE);