diff options
author | Julian Eisel <julian@blender.org> | 2020-03-06 18:22:28 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-03-06 18:27:13 +0300 |
commit | d5572eacc5958db38ac4a4a32eddb3a2cd24bf68 (patch) | |
tree | 5252d8f509dae02bf9c137a1710c073d5bbac592 /source/blender/windowmanager/intern/wm_gesture.c | |
parent | b242cc67928a6858a835c088e4d3ea8822c83168 (diff) |
Cleanup: Reduce context usage in UI functions
Part of https://developer.blender.org/T74429.
There's a chance that this causes some issues becaue in some cases we
change from getting the window from context to getting it from somewhere
else.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_gesture.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm_gesture.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index 5943e947b41..bd9a6464332 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -51,11 +51,9 @@ #include "BIF_glutil.h" /* context checked on having screen, window and area */ -wmGesture *WM_gesture_new(bContext *C, const wmEvent *event, int type) +wmGesture *WM_gesture_new(wmWindow *window, const ARegion *ar, const wmEvent *event, int type) { wmGesture *gesture = MEM_callocN(sizeof(wmGesture), "new gesture"); - wmWindow *window = CTX_wm_window(C); - ARegion *ar = CTX_wm_region(C); BLI_addtail(&window->gesture, gesture); @@ -97,7 +95,7 @@ wmGesture *WM_gesture_new(bContext *C, const wmEvent *event, int type) return gesture; } -static void wm_gesture_end_with_window(wmWindow *win, wmGesture *gesture) +void WM_gesture_end(wmWindow *win, wmGesture *gesture) { if (win->tweak == gesture) { win->tweak = NULL; @@ -108,24 +106,17 @@ static void wm_gesture_end_with_window(wmWindow *win, wmGesture *gesture) MEM_freeN(gesture); } -void WM_gesture_end(bContext *C, wmGesture *gesture) -{ - wm_gesture_end_with_window(CTX_wm_window(C), gesture); -} - void WM_gestures_free_all(wmWindow *win) { while (win->gesture.first) { - wm_gesture_end_with_window(win, win->gesture.first); + WM_gesture_end(win, win->gesture.first); } } -void WM_gestures_remove(bContext *C) +void WM_gestures_remove(wmWindow *win) { - wmWindow *win = CTX_wm_window(C); - while (win->gesture.first) { - WM_gesture_end(C, win->gesture.first); + WM_gesture_end(win, win->gesture.first); } } @@ -531,9 +522,9 @@ void wm_gesture_draw(wmWindow *win) } } -void wm_gesture_tag_redraw(bContext *C) +void wm_gesture_tag_redraw(wmWindow *win) { - bScreen *screen = CTX_wm_screen(C); + bScreen *screen = WM_window_get_active_screen(win); if (screen) { screen->do_draw_gesture = true; |