diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-09-07 02:34:29 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-07 02:34:29 +0400 |
commit | 35cd649c6625b55aad277fdbeaa87cc5d21b65ce (patch) | |
tree | dc5a73685f89ea525b40e62534d8af4e9de7fa4b /source/blender/editors/interface/view2d_ops.c | |
parent | da2c76d9f7e1a29ad91ab8aaf95bb912800296a4 (diff) |
rename cursor setting functions to make modal set/restore more clearly related functions.
Diffstat (limited to 'source/blender/editors/interface/view2d_ops.c')
-rw-r--r-- | source/blender/editors/interface/view2d_ops.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 3e9e16b285c..03bd7e4631b 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -219,11 +219,11 @@ static int view_pan_invoke(bContext *C, wmOperator *op, const wmEvent *event) RNA_int_set(op->ptr, "deltay", 0); if (v2d->keepofs & V2D_LOCKOFS_X) - WM_cursor_modal(window, BC_NS_SCROLLCURSOR); + WM_cursor_modal_set(window, BC_NS_SCROLLCURSOR); else if (v2d->keepofs & V2D_LOCKOFS_Y) - WM_cursor_modal(window, BC_EW_SCROLLCURSOR); + WM_cursor_modal_set(window, BC_EW_SCROLLCURSOR); else - WM_cursor_modal(window, BC_NSEW_SCROLLCURSOR); + WM_cursor_modal_set(window, BC_NSEW_SCROLLCURSOR); /* add temp handler */ WM_event_add_modal_handler(C, op); @@ -260,7 +260,7 @@ static int view_pan_modal(bContext *C, wmOperator *op, const wmEvent *event) RNA_int_set(op->ptr, "deltay", (vpd->starty - vpd->lasty)); view_pan_exit(op); - WM_cursor_restore(CTX_wm_window(C)); + WM_cursor_modal_restore(CTX_wm_window(C)); WM_operator_name_call(C, "VIEW2D_OT_zoom", WM_OP_INVOKE_DEFAULT, NULL); return OPERATOR_FINISHED; } @@ -273,7 +273,7 @@ static int view_pan_modal(bContext *C, wmOperator *op, const wmEvent *event) RNA_int_set(op->ptr, "deltay", (vpd->starty - vpd->lasty)); view_pan_exit(op); - WM_cursor_restore(CTX_wm_window(C)); + WM_cursor_modal_restore(CTX_wm_window(C)); return OPERATOR_FINISHED; } @@ -987,11 +987,11 @@ static int view_zoomdrag_invoke(bContext *C, wmOperator *op, const wmEvent *even } if (v2d->keepofs & V2D_LOCKOFS_X) - WM_cursor_modal(window, BC_NS_SCROLLCURSOR); + WM_cursor_modal_set(window, BC_NS_SCROLLCURSOR); else if (v2d->keepofs & V2D_LOCKOFS_Y) - WM_cursor_modal(window, BC_EW_SCROLLCURSOR); + WM_cursor_modal_set(window, BC_EW_SCROLLCURSOR); else - WM_cursor_modal(window, BC_NSEW_SCROLLCURSOR); + WM_cursor_modal_set(window, BC_NSEW_SCROLLCURSOR); /* add temp handler */ WM_event_add_modal_handler(C, op); @@ -1093,7 +1093,7 @@ static int view_zoomdrag_modal(bContext *C, wmOperator *op, const wmEvent *event /* free customdata */ view_zoomdrag_exit(C, op); - WM_cursor_restore(CTX_wm_window(C)); + WM_cursor_modal_restore(CTX_wm_window(C)); return OPERATOR_FINISHED; } |