diff options
author | Peter Kim <pk15950@gmail.com> | 2022-04-03 05:10:23 +0300 |
---|---|---|
committer | Peter Kim <pk15950@gmail.com> | 2022-04-03 05:10:23 +0300 |
commit | d34e2cc3be677ec0e0a26b4239b1d329e6822819 (patch) | |
tree | fa933856589ff369ed739f38f603fca4f2458987 /source/blender/windowmanager/intern/wm_event_system.c | |
parent | 07b0b6e9b78c9fc99f563244aec202acda536f2d (diff) | |
parent | 79ff65d07bac0ecf0170542f86dc03a0228b53d5 (diff) |
Merge branch 'master' into xr-dev
Diffstat (limited to 'source/blender/windowmanager/intern/wm_event_system.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 60ae4eccbbe..84c40c42adc 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1297,6 +1297,23 @@ static wmOperator *wm_operator_create(wmWindowManager *wm, return op; } +/** + * This isn't very nice but needed to redraw gizmos which are hidden while tweaking, + * See #WM_GIZMOGROUPTYPE_DELAY_REFRESH_FOR_TWEAK for details. + */ +static void wm_region_tag_draw_on_gizmo_delay_refresh_for_tweak(wmWindow *win, bScreen *screen) +{ + ED_screen_areas_iter (win, screen, area) { + LISTBASE_FOREACH (ARegion *, region, &area->regionbase) { + if (region->gizmo_map != NULL) { + if (WM_gizmomap_tag_delay_refresh_for_tweak_check(region->gizmo_map)) { + ED_region_tag_redraw(region); + } + } + } + } +} + static void wm_region_mouse_co(bContext *C, wmEvent *event) { ARegion *region = CTX_wm_region(C); @@ -3711,6 +3728,7 @@ void wm_event_do_handlers(bContext *C) event->flag |= WM_EVENT_FORCE_DRAG_THRESHOLD; } } + const bool event_queue_check_drag_prev = win->event_queue_check_drag; /* Active screen might change during handlers, update pointer. */ screen = WM_window_get_active_screen(win); @@ -3870,6 +3888,10 @@ void wm_event_do_handlers(bContext *C) win->event_queue_check_drag_handled = false; } + if (event_queue_check_drag_prev && (win->event_queue_check_drag == false)) { + wm_region_tag_draw_on_gizmo_delay_refresh_for_tweak(win, screen); + } + /* Update previous mouse position for following events to use. */ copy_v2_v2_int(win->eventstate->prev_xy, event->xy); |