diff options
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_ops.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/interface/view2d_ops.c | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index dc7813510ec..e20b55d95a9 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -1981,7 +1981,7 @@ static void ui_textedit_begin(bContext *C, uiBut *but, uiHandleButtonData *data) ui_check_but(but); - WM_cursor_modal(CTX_wm_window(C), BC_TEXTEDITCURSOR); + WM_cursor_modal_set(CTX_wm_window(C), BC_TEXTEDITCURSOR); } static void ui_textedit_end(bContext *C, uiBut *but, uiHandleButtonData *data) @@ -2013,7 +2013,7 @@ static void ui_textedit_end(bContext *C, uiBut *but, uiHandleButtonData *data) but->pos = -1; } - WM_cursor_restore(CTX_wm_window(C)); + WM_cursor_modal_restore(CTX_wm_window(C)); } static void ui_textedit_next_but(uiBlock *block, uiBut *actbut, uiHandleButtonData *data) diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index cfe6e313c58..d714402de9f 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -118,7 +118,7 @@ static int eyedropper_init(bContext *C, wmOperator *op) static void eyedropper_exit(bContext *C, wmOperator *op) { - WM_cursor_restore(CTX_wm_window(C)); + WM_cursor_modal_restore(CTX_wm_window(C)); if (op->customdata) MEM_freeN(op->customdata); @@ -289,7 +289,7 @@ static int eyedropper_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED( { /* init */ if (eyedropper_init(C, op)) { - WM_cursor_modal(CTX_wm_window(C), BC_EYEDROPPER_CURSOR); + WM_cursor_modal_set(CTX_wm_window(C), BC_EYEDROPPER_CURSOR); /* add temp handler */ WM_event_add_modal_handler(C, op); 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; } |