blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix status bar wrong cursor keymap using wrong region in some cases.

This commit is contained in:
Brecht Van Lommel 2018-06-26 19:44:08 +02:00
parent df02675e21
commit e0b28306df
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/windowmanager/intern/wm_event_system.c
View File

@ -4347,14 +4347,23 @@ void WM_window_cursor_keymap_status_refresh(bContext *C, struct wmWindow *win)
struct CursorKeymapInfo cd_prev = *((struct CursorKeymapInfo *)win->cursor_keymap_status);
cd->state_event = *win->eventstate;
ScrArea *sa = BKE_screen_find_area_xy(screen, SPACE_TYPE_ANY, win->eventstate->x, win->eventstate->y);
if (sa == NULL) {
return;
}
ARegion *ar = BKE_area_find_region_xy(sa, RGN_TYPE_ANY, win->eventstate->x, win->eventstate->y);
/* Find active region and associated area. */
ARegion *ar = screen->active_region;
if (ar == NULL) {
return;
}
ScrArea *sa = NULL;
ED_screen_areas_iter(win, screen, sa_iter) {
if (BLI_findindex(&sa_iter->regionbase, ar) != -1) {
sa = sa_iter;
break;
}
}
if (sa == NULL) {
return;
}
/* Keep as-is. */
if (ELEM(ar->regiontype, RGN_TYPE_HEADER, RGN_TYPE_TEMPORARY, RGN_TYPE_HUD)) {
return;