diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-04-19 10:18:57 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-04-19 10:18:57 +0300 |
commit | 3b4b231be52608a366af67e7effdd996cfbb3d17 (patch) | |
tree | aab910b7b5f32be4bff6939b5a682cf3b40ffd34 | |
parent | 0b903755a9908344e9fcb4a33b4f0340abeb9386 (diff) |
Cleanup: re-order gizmo handling checks
Non-functional change in preparation for fix.
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 2244f897597..0764dce7158 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2595,6 +2595,11 @@ static int wm_handlers_do_gizmo_handler(bContext *C, ListBase *handlers, const bool do_debug_handler) { + /* Drag events use the previous click location to highlight the gizmos, + * Get the highlight again in case the user dragged off the gizmo. */ + const bool is_event_drag = ISTWEAK(event->type) || (event->val == KM_CLICK_DRAG); + const bool is_event_modifier = ISKEYMODIFIER(event->type); + int action = WM_HANDLER_CONTINUE; ScrArea *area = CTX_wm_area(C); ARegion *region = CTX_wm_region(C); @@ -2615,6 +2620,16 @@ static int wm_handlers_do_gizmo_handler(bContext *C, } } + struct { + wmGizmo *gz_modal; + wmGizmo *gz; + int part; + } prev = { + .gz_modal = wm_gizmomap_modal_get(gzmap), + .gz = gz, + .part = gz ? gz->highlight_part : 0, + }; + if (region->gizmo_map != handler->gizmo_map) { WM_gizmomap_tag_refresh(handler->gizmo_map); } @@ -2622,16 +2637,11 @@ static int wm_handlers_do_gizmo_handler(bContext *C, wm_gizmomap_handler_context_gizmo(C, handler); wm_region_mouse_co(C, event); - /* Drag events use the previous click location to highlight the gizmos, - * Get the highlight again in case the user dragged off the gizmo. */ - const bool is_event_drag = ISTWEAK(event->type) || (event->val == KM_CLICK_DRAG); - const bool is_event_modifier = ISKEYMODIFIER(event->type); - bool handle_highlight = false; bool handle_keymap = false; /* Handle gizmo highlighting. */ - if (!wm_gizmomap_modal_get(gzmap) && + if ((prev.gz_modal == NULL) && ((event->type == MOUSEMOVE) || is_event_modifier || is_event_drag)) { handle_highlight = true; if (is_event_modifier || is_event_drag) { @@ -2643,13 +2653,6 @@ static int wm_handlers_do_gizmo_handler(bContext *C, } if (handle_highlight) { - struct { - wmGizmo *gz; - int part; - } prev = { - .gz = gz, - .part = gz ? gz->highlight_part : 0, - }; int part = -1; gz = wm_gizmomap_highlight_find(gzmap, C, event, &part); |