griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T66538: Menus in popups opening on mouse over

Browse Source 
Caused by b708917d94

Solve by restricting this change to popovers
instead of other kinds of menus (enums mainly).
This commit is contained in:
Campbell Barton
2019-07-09 00:21:26 +10:00
parent a4bc6aca0e
commit 50d0a74833
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7301,7 +7301,11 @@ static void button_activate_state(bContext *C, uiBut *but, uiHandleButtonState s
button_tooltip_timer_reset(C, but);
/* automatic open pulldown block timer */
if (ELEM(but->type, UI_BTYPE_BLOCK, UI_BTYPE_PULLDOWN, UI_BTYPE_POPOVER, UI_BTYPE_MENU)) {
if (ELEM(but->type, UI_BTYPE_BLOCK, UI_BTYPE_PULLDOWN, UI_BTYPE_POPOVER) ||
/* Menu button types may draw as popovers, check for this case
* ignoring other kinds of menus (mainly enums). (see T66538). */
((but->type == UI_BTYPE_MENU) &&
(UI_but_paneltype_get(but) || ui_but_menu_draw_as_popover(but)))) {
if (data->used_mouse && !data->autoopentimer) {
int time;