bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix T48743: Broken menu key accelerators

Browse Source 
Regression caused by fc96110b
This commit is contained in:
Campbell Barton 2016-06-27 14:08:36 +10:00
parent 538a70c9b6
commit 936c176a71
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/interface/interface_handlers.c
View File

@ -9813,10 +9813,17 @@ static int ui_handle_menus_recursive(
retval = ui_pie_handler(C, event, menu);
}
else if (event->type == LEFTMOUSE || event->val != KM_DBL_CLICK) {
bool handled = false;
if (listbox) {
retval = ui_handle_list_event(C, event, menu->region, listbox);
int retval_test = ui_handle_list_event(C, event, menu->region, listbox);
if (retval_test != WM_UI_HANDLER_CONTINUE) {
retval = retval_test;
handled = true;
}
if (retval == WM_UI_HANDLER_CONTINUE) {
}
if (handled == false) {
retval = ui_handle_menu_event(
C, event, menu, level,
is_parent_inside, is_parent_menu, is_floating);