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/windowmanager | |
parent | da2c76d9f7e1a29ad91ab8aaf95bb912800296a4 (diff) |
rename cursor setting functions to make modal set/restore more clearly related functions.
Diffstat (limited to 'source/blender/windowmanager')
5 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 4480b8ab158..c55898d178c 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -111,9 +111,9 @@ void WM_autosave_init(struct wmWindowManager *wm); void WM_recover_last_session(struct bContext *C, struct ReportList *reports); /* mouse cursors */ -void WM_cursor_set (struct wmWindow *win, int curs); -void WM_cursor_modal (struct wmWindow *win, int curs); -void WM_cursor_restore (struct wmWindow *win); +void WM_cursor_set(struct wmWindow *win, int curs); +void WM_cursor_modal_set(struct wmWindow *win, int curs); +void WM_cursor_modal_restore(struct wmWindow *win); void WM_cursor_wait (bool val); void WM_cursor_grab_enable(struct wmWindow *win, bool wrap, bool hide, int bounds[4]); void WM_cursor_grab_disable(struct wmWindow *win, int mouse_ungrab_xy[2]); diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c index e76d38dd0e2..9b308553006 100644 --- a/source/blender/windowmanager/intern/wm_cursors.c +++ b/source/blender/windowmanager/intern/wm_cursors.c @@ -150,7 +150,7 @@ void WM_cursor_set(wmWindow *win, int curs) } } -void WM_cursor_modal(wmWindow *win, int val) +void WM_cursor_modal_set(wmWindow *win, int val) { if (win->lastcursor == 0) win->lastcursor = win->cursor; @@ -158,7 +158,7 @@ void WM_cursor_modal(wmWindow *win, int val) WM_cursor_set(win, val); } -void WM_cursor_restore(wmWindow *win) +void WM_cursor_modal_restore(wmWindow *win) { win->modalcursor = 0; if (win->lastcursor) @@ -175,10 +175,10 @@ void WM_cursor_wait(bool val) for (; win; win = win->next) { if (val) { - WM_cursor_modal(win, BC_WAITCURSOR); + WM_cursor_modal_set(win, BC_WAITCURSOR); } else { - WM_cursor_restore(win); + WM_cursor_modal_restore(win); } } } diff --git a/source/blender/windowmanager/intern/wm_dragdrop.c b/source/blender/windowmanager/intern/wm_dragdrop.c index 0c78338c18a..3e2d01d6e80 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.c +++ b/source/blender/windowmanager/intern/wm_dragdrop.c @@ -233,10 +233,10 @@ static void wm_drop_operator_options(bContext *C, wmDrag *drag, wmEvent *event) if (opname) { BLI_strncpy(drag->opname, opname, FILE_MAX); - // WM_cursor_modal(win, CURSOR_COPY); + // WM_cursor_modal_set(win, CURSOR_COPY); } // else - // WM_cursor_restore(win); + // WM_cursor_modal_restore(win); /* unsure about cursor type, feels to be too much */ } } diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 72cd794489b..edcbca8433f 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2103,7 +2103,7 @@ static void wm_event_drag_test(wmWindowManager *wm, wmWindow *win, wmEvent *even win->screen->do_draw_drag = TRUE; /* restore cursor (disabled, see wm_dragdrop.c) */ - // WM_cursor_restore(win); + // WM_cursor_modal_restore(win); } /* overlap fails otherwise */ diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 62b29266c5c..a7d03afb7d3 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2756,7 +2756,7 @@ static void wm_gesture_end(bContext *C, wmOperator *op) ED_area_tag_redraw(CTX_wm_area(C)); if (RNA_struct_find_property(op->ptr, "cursor") ) - WM_cursor_restore(CTX_wm_window(C)); + WM_cursor_modal_restore(CTX_wm_window(C)); } int WM_border_select_invoke(bContext *C, wmOperator *op, const wmEvent *event) @@ -3065,7 +3065,7 @@ int WM_gesture_lasso_invoke(bContext *C, wmOperator *op, const wmEvent *event) wm_gesture_tag_redraw(C); if (RNA_struct_find_property(op->ptr, "cursor") ) - WM_cursor_modal(CTX_wm_window(C), RNA_int_get(op->ptr, "cursor")); + WM_cursor_modal_set(CTX_wm_window(C), RNA_int_get(op->ptr, "cursor")); return OPERATOR_RUNNING_MODAL; } @@ -3080,7 +3080,7 @@ int WM_gesture_lines_invoke(bContext *C, wmOperator *op, const wmEvent *event) wm_gesture_tag_redraw(C); if (RNA_struct_find_property(op->ptr, "cursor") ) - WM_cursor_modal(CTX_wm_window(C), RNA_int_get(op->ptr, "cursor")); + WM_cursor_modal_set(CTX_wm_window(C), RNA_int_get(op->ptr, "cursor")); return OPERATOR_RUNNING_MODAL; } @@ -3297,7 +3297,7 @@ int WM_gesture_straightline_invoke(bContext *C, wmOperator *op, const wmEvent *e wm_gesture_tag_redraw(C); if (RNA_struct_find_property(op->ptr, "cursor") ) - WM_cursor_modal(CTX_wm_window(C), RNA_int_get(op->ptr, "cursor")); + WM_cursor_modal_set(CTX_wm_window(C), RNA_int_get(op->ptr, "cursor")); return OPERATOR_RUNNING_MODAL; } |