godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #103414 from dugramen/itemlist-shift-key-select

Browse Source 
ItemList multiselect with shift up & down arrow keys
This commit is contained in:
Thaddeus Crews
2025-04-27 19:21:33 -05:00
parent faab991792 aebb85a064
commit 9c324a8524
2 changed files with 70 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
scene/gui/item_list.cpp
View File

@@ -735,6 +735,11 @@ void ItemList::gui_input(const Ref<InputEvent> &p_event) {
} }
Ref<InputEventMouseButton> mb = p_event; Ref<InputEventMouseButton> mb = p_event;
Ref<InputEventKey> ev_key = p_event;
if (ev_key.is_valid() && ev_key->get_keycode() == Key::SHIFT && !ev_key->is_pressed()) {
shift_anchor = -1;
}
if (defer_select_single >= 0 && mb.is_valid() && mb->get_button_index() == MouseButton::LEFT && !mb->is_pressed()) { if (defer_select_single >= 0 && mb.is_valid() && mb->get_button_index() == MouseButton::LEFT && !mb->is_pressed()) {
select(defer_select_single, true); select(defer_select_single, true);
@@ -904,7 +909,14 @@ void ItemList::gui_input(const Ref<InputEvent> &p_event) {
return; return;
} }
} }
if (p_event->is_action("ui_up", true)) { // Shift Up Selection.
if (select_mode == SELECT_MULTI && p_event->is_action("ui_up", false) && ev_key.is_valid() && ev_key->is_shift_pressed()) {
int next = MAX(current - max_columns, 0);
_shift_range_select(current, next);
accept_event();
}
else if (p_event->is_action("ui_up", true)) {
if (!search_string.is_empty()) { if (!search_string.is_empty()) {
uint64_t now = OS::get_singleton()->get_ticks_msec(); uint64_t now = OS::get_singleton()->get_ticks_msec();
uint64_t diff = now - search_time_msec; uint64_t diff = now - search_time_msec;
@@ -942,7 +954,16 @@ void ItemList::gui_input(const Ref<InputEvent> &p_event) {
} }
accept_event(); accept_event();
} }
} else if (p_event->is_action("ui_down", true)) { }
// Shift Down Selection.
else if (select_mode == SELECT_MULTI && p_event->is_action("ui_down", false) && ev_key.is_valid() && ev_key->is_shift_pressed()) {
int next = MIN(current + max_columns, items.size() - 1);
_shift_range_select(current, next);
accept_event();
}
else if (p_event->is_action("ui_down", true)) {
if (!search_string.is_empty()) { if (!search_string.is_empty()) {
uint64_t now = OS::get_singleton()->get_ticks_msec(); uint64_t now = OS::get_singleton()->get_ticks_msec();
uint64_t diff = now - search_time_msec; uint64_t diff = now - search_time_msec;
@@ -1010,7 +1031,16 @@ void ItemList::gui_input(const Ref<InputEvent> &p_event) {
break; break;
} }
} }
} else if (p_event->is_action("ui_left", true)) { }
// Shift Left Selection.
else if (select_mode == SELECT_MULTI && p_event->is_action("ui_left", false) && ev_key.is_valid() && ev_key->is_shift_pressed()) {
int next = MAX(current - 1, 0);
_shift_range_select(current, next);
accept_event();
}
else if (p_event->is_action("ui_left", true)) {
search_string = ""; //any mousepress cancels search_string = ""; //any mousepress cancels
if (current % current_columns != 0) { if (current % current_columns != 0) {
@@ -1030,7 +1060,16 @@ void ItemList::gui_input(const Ref<InputEvent> &p_event) {
} }
accept_event(); accept_event();
} }
} else if (p_event->is_action("ui_right", true)) { }
// Shift Right Selection.
else if (select_mode == SELECT_MULTI && p_event->is_action("ui_right", false) && ev_key.is_valid() && ev_key->is_shift_pressed()) {
int next = MIN(current + 1, items.size() - 1);
_shift_range_select(current, next);
accept_event();
}
else if (p_event->is_action("ui_right", true)) {
search_string = ""; //any mousepress cancels search_string = ""; //any mousepress cancels
if (current % current_columns != (current_columns - 1) && current + 1 < items.size()) { if (current % current_columns != (current_columns - 1) && current + 1 < items.size()) {
@@ -1865,6 +1904,31 @@ void ItemList::_mouse_exited() {
} }
} }
void ItemList::_shift_range_select(int p_from, int p_to) {
ERR_FAIL_INDEX(p_from, items.size());
ERR_FAIL_INDEX(p_to, items.size());
if (shift_anchor == -1) {
shift_anchor = p_from;
}
for (int i = 0; i < items.size(); i++) {
if (i >= MIN(shift_anchor, p_to) && i <= MAX(shift_anchor, p_to)) {
if (!is_selected(i)) {
select(i, false);
emit_signal(SNAME("multi_selected"), i, true);
}
} else if (is_selected(i)) {
deselect(i);
emit_signal(SNAME("multi_selected"), i, false);
}
}
current = p_to;
queue_redraw();
ensure_current_is_visible();
}
String ItemList::_atr(int p_idx, const String &p_text) const { String ItemList::_atr(int p_idx, const String &p_text) const {
ERR_FAIL_INDEX_V(p_idx, items.size(), atr(p_text)); ERR_FAIL_INDEX_V(p_idx, items.size(), atr(p_text));
switch (items[p_idx].auto_translate_mode) { switch (items[p_idx].auto_translate_mode) {

2
scene/gui/item_list.h
View File

@@ -98,6 +98,7 @@ private:
int current = -1; int current = -1;
int hovered = -1; int hovered = -1;
int prev_hovered = -1; int prev_hovered = -1;
int shift_anchor = -1;
bool shape_changed = true; bool shape_changed = true;
@@ -173,6 +174,7 @@ private:
void _scroll_changed(double); void _scroll_changed(double);
void _shape_text(int p_idx); void _shape_text(int p_idx);
void _mouse_exited(); void _mouse_exited();
void _shift_range_select(int p_from, int p_to);
String _atr(int p_idx, const String &p_text) const; String _atr(int p_idx, const String &p_text) const;