diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-03-05 09:09:01 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-03-05 09:10:11 +0300 |
commit | b5d154f400e46ba322f0e08a231bb2557bf51a1e (patch) | |
tree | 554d34430b54a1bdac5315b856aa93809b2ef4b2 /source/blender/windowmanager/intern/wm.c | |
parent | 663b0bb04c324659f24e6b408ee4437cb3d5148b (diff) |
Cleanup: move check_drag & check_click out of wmEvent
These variables track the wmWindow.event_queue state,
however they were used in a way that wasn't correct.
- check_drag & check_click from wmWindow.eventstate
were used to track the click/drag status of events handled in
wmWindow.event_queue.
- Event's in the queue read from wmEvent.check_drag.
- Once a drag action was detected, wmWindow.eventstate.check_drag
was disabled.
Disabling drag in the event state would not change the drag state
for values already in the event queue.
Simplify logic by moving these values into the window,
so there is one place these variables are tracked.
Diffstat (limited to 'source/blender/windowmanager/intern/wm.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c index f9fb484c055..c5a429d7839 100644 --- a/source/blender/windowmanager/intern/wm.c +++ b/source/blender/windowmanager/intern/wm.c @@ -184,6 +184,8 @@ static void window_manager_blend_read_data(BlendDataReader *reader, ID *id) win->modalcursor = 0; win->grabcursor = 0; win->addmousemove = true; + win->event_queue_check_click = 0; + win->event_queue_check_drag = 0; BLO_read_data_address(reader, &win->stereo3d_format); /* Multi-view always fallback to anaglyph at file opening |