diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-04-21 18:39:34 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-04-21 18:42:49 +0300 |
| commit | 22bd1559e1fb813c959327655790e8916dd250c1 (patch) | |
| tree | be8403e4b423874c036ea490c17e396c969c2128 /source/blender/windowmanager/intern | |
| parent | c23f33ac9e94d98cc1f593653f0e3abb031ecae0 (diff) | |
Fix active region flickering in some cases, now always update before draw.
Diffstat (limited to 'source/blender/windowmanager/intern')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_draw.c | 1 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index 99319e009c8..b3e9eaeec45 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -960,6 +960,7 @@ void wm_draw_update(bContext *C) wm_window_make_drawable(wm, win); /* notifiers for screen redraw */ + ED_screen_set_active_region(C, &win->eventstate->x); ED_screen_ensure_updated(wm, win, screen); int drawmethod = wm_automatic_draw_method(win); diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 218f48e9be6..95ead3befdc 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2768,7 +2768,7 @@ void wm_event_do_handlers(bContext *C) /* Note: setting subwin active should be done here, after modal handlers have been done */ if (event->type == MOUSEMOVE) { /* state variables in screen, cursors. Also used in wm_draw.c, fails for modal handlers though */ - ED_screen_set_active_region(C, event); + ED_screen_set_active_region(C, &event->x); /* for regions having custom cursors */ wm_paintcursor_test(C, event); } |