asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #11328 from Paulb23/left_right_arrow_tree_issue_10737

Browse source 
Added Left / Right arrow navigation in tree, issue 10737
This commit is contained in:
Rémi Verschelde 2017-09-17 22:45:19 +02:00 committed by GitHub
commit a00f19a921
1 changed files with 72 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
scene/gui/tree.cpp
View file

@ -2010,7 +2010,7 @@ void Tree::_gui_input(Ref<InputEvent> p_event) {
if (!k->is_pressed()) if (!k->is_pressed())
return; return;
if (k->get_alt() || k->get_command() || (k->get_shift() && k->get_unicode() == 0) || k->get_metakey()) if (k->get_command() || (k->get_shift() && k->get_unicode() == 0) || k->get_metakey())
return; return;
if (!root) if (!root)
return; return;
@ -2025,48 +2025,47 @@ void Tree::_gui_input(Ref<InputEvent> p_event) {
break; \ break; \
} }
case KEY_RIGHT: { case KEY_RIGHT: {
bool dobreak = true;
//TreeItem *next = NULL; //TreeItem *next = NULL;
if (!selected_item) if (!selected_item)
break; break;
if (select_mode == SELECT_ROW) if (select_mode == SELECT_ROW) {
EXIT_BREAK; EXIT_BREAK;
if (selected_col >= (columns.size() - 1))
EXIT_BREAK;
if (select_mode == SELECT_MULTI) {
selected_col++;
emit_signal("cell_selected");
} else {
selected_item->select(selected_col + 1);
} }
if (selected_col > (columns.size() - 1)) {
EXIT_BREAK;
}
if (k->get_alt()) {
selected_item->set_collapsed(false);
TreeItem *next = selected_item->get_children();
while (next && next != selected_item->next) {
next->set_collapsed(false);
next = next->get_next_visible();
}
} else if (selected_col == (columns.size() - 1)) {
if (selected_item->get_children() != NULL && selected_item->is_collapsed()) {
selected_item->set_collapsed(false);
} else {
selected_col = 0;
dobreak = false; // fall through to key_down
}
} else {
if (select_mode == SELECT_MULTI) {
selected_col++;
emit_signal("cell_selected");
} else {
selected_item->select(selected_col + 1);
}
}
update(); update();
ensure_cursor_is_visible(); ensure_cursor_is_visible();
accept_event(); accept_event();
if (dobreak) {
} break;
case KEY_LEFT: {
//TreeItem *next = NULL;
if (!selected_item)
break; break;
if (select_mode == SELECT_ROW)
EXIT_BREAK;
if (selected_col <= 0)
EXIT_BREAK;
if (select_mode == SELECT_MULTI) {
selected_col--;
emit_signal("cell_selected");
} else {
selected_item->select(selected_col - 1);
} }
}
update();
accept_event();
} break;
case KEY_DOWN: { case KEY_DOWN: {
TreeItem *next = NULL; TreeItem *next = NULL;
@ -2113,6 +2112,48 @@ void Tree::_gui_input(Ref<InputEvent> p_event) {
accept_event(); accept_event();
} break; } break;
case KEY_LEFT: {
bool dobreak = true;
//TreeItem *next = NULL;
if (!selected_item)
break;
if (select_mode == SELECT_ROW) {
EXIT_BREAK;
}
if (selected_col < 0) {
EXIT_BREAK;
}
if (k->get_alt()) {
selected_item->set_collapsed(true);
TreeItem *next = selected_item->get_children();
while (next && next != selected_item->next) {
next->set_collapsed(true);
next = next->get_next_visible();
}
} else if (selected_col == 0) {
if (selected_item->get_children() != NULL && !selected_item->is_collapsed()) {
selected_item->set_collapsed(true);
} else {
selected_col = columns.size() - 1;
dobreak = false; // fall through to key_up
}
} else {
if (select_mode == SELECT_MULTI) {
selected_col--;
emit_signal("cell_selected");
} else {
selected_item->select(selected_col - 1);
}
}
update();
accept_event();
if (dobreak) {
break;
}
}
case KEY_UP: { case KEY_UP: {
TreeItem *prev = NULL; TreeItem *prev = NULL;