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

Popupmenu now uses UI actions instead of keys

Browse Source
This commit is contained in:
Fabio Alessandrelli 2017-12-31 04:42:25 +01:00
parent be7bfdfac3
commit 4a71483a65
1 changed files with 47 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
scene/gui/popup_menu.cpp
View File

@ -211,86 +211,67 @@ void PopupMenu::_scroll(float p_factor, const Point2 &p_over) {
void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) { void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) {
Ref<InputEventKey> k = p_event; if (p_event->is_action("ui_down") && p_event->is_pressed()) {
if (k.is_valid()) { int search_from = mouse_over + 1;
if (search_from >= items.size())
search_from = 0;
if (!k->is_pressed()) for (int i = search_from; i < items.size(); i++) {
return;
switch (k->get_scancode()) { if (i < 0 || i >= items.size())
continue;
case KEY_DOWN: { if (!items[i].separator && !items[i].disabled) {
int search_from = mouse_over + 1; mouse_over = i;
if (search_from >= items.size()) update();
search_from = 0; accept_event();
break;
}
}
} else if (p_event->is_action("ui_up") && p_event->is_pressed()) {
for (int i = search_from; i < items.size(); i++) { int search_from = mouse_over - 1;
if (search_from < 0)
search_from = items.size() - 1;
if (i < 0 || i >= items.size()) for (int i = search_from; i >= 0; i--) {
continue;
if (!items[i].separator && !items[i].disabled) { if (i < 0 || i >= items.size())
continue;
mouse_over = i; if (!items[i].separator && !items[i].disabled) {
update();
break;
}
}
} break;
case KEY_UP: {
int search_from = mouse_over - 1; mouse_over = i;
if (search_from < 0) update();
search_from = items.size() - 1; accept_event();
break;
}
}
} else if (p_event->is_action("ui_left") && p_event->is_pressed()) {
for (int i = search_from; i >= 0; i--) { Node *n = get_parent();
if (n && Object::cast_to<PopupMenu>(n)) {
hide();
accept_event();
}
} else if (p_event->is_action("ui_right") && p_event->is_pressed()) {
if (i < 0 || i >= items.size()) if (mouse_over >= 0 && mouse_over < items.size() && !items[mouse_over].separator && items[mouse_over].submenu != "" && submenu_over != mouse_over) {
continue; _activate_submenu(mouse_over);
accept_event();
}
} else if (p_event->is_action("ui_accept") && p_event->is_pressed()) {
if (!items[i].separator && !items[i].disabled) { if (mouse_over >= 0 && mouse_over < items.size() && !items[mouse_over].separator) {
mouse_over = i; if (items[mouse_over].submenu != "" && submenu_over != mouse_over) {
update(); _activate_submenu(mouse_over);
break; } else {
} activate_item(mouse_over);
} }
} break; accept_event();
case KEY_LEFT: {
Node *n = get_parent();
if (!n)
break;
PopupMenu *pm = Object::cast_to<PopupMenu>(n);
if (!pm)
break;
hide();
} break;
case KEY_RIGHT: {
if (mouse_over >= 0 && mouse_over < items.size() && !items[mouse_over].separator && items[mouse_over].submenu != "" && submenu_over != mouse_over)
_activate_submenu(mouse_over);
} break;
case KEY_ENTER:
case KEY_KP_ENTER: {
if (mouse_over >= 0 && mouse_over < items.size() && !items[mouse_over].separator) {
if (items[mouse_over].submenu != "" && submenu_over != mouse_over) {
_activate_submenu(mouse_over);
break;
}
activate_item(mouse_over);
}
} break;
} }
} }