diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-16 09:01:28 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-16 09:03:08 +0300 |
| commit | 8550c2b92251815a39f95a9128f1fbc51f204a07 (patch) | |
| tree | 263d5322f094a5089d1465f7d08989bd639781f9 /source/blender/windowmanager | |
| parent | 83b60dac57a1aa432c8f7c165603ef327c6911d6 (diff) | |
Cleanup: modal operator border callback names
Use same convention as all others.
Remove 'select' since these are used for zoom as well.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/WM_api.h | 6 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operator_props.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 40722736d58..aa52e7d2248 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -374,9 +374,9 @@ void WM_menutype_freelink(struct MenuType *mt); void WM_menutype_free(void); /* default operator callbacks for border/circle/lasso */ -int WM_border_select_invoke (struct bContext *C, struct wmOperator *op, const struct wmEvent *event); -int WM_border_select_modal (struct bContext *C, struct wmOperator *op, const struct wmEvent *event); -void WM_border_select_cancel(struct bContext *C, struct wmOperator *op); +int WM_gesture_border_invoke (struct bContext *C, struct wmOperator *op, const struct wmEvent *event); +int WM_gesture_border_modal (struct bContext *C, struct wmOperator *op, const struct wmEvent *event); +void WM_gesture_border_cancel(struct bContext *C, struct wmOperator *op); int WM_gesture_circle_invoke(struct bContext *C, struct wmOperator *op, const struct wmEvent *event); int WM_gesture_circle_modal(struct bContext *C, struct wmOperator *op, const struct wmEvent *event); void WM_gesture_circle_cancel(struct bContext *C, struct wmOperator *op); diff --git a/source/blender/windowmanager/intern/wm_operator_props.c b/source/blender/windowmanager/intern/wm_operator_props.c index 569cd43a524..b8b52798175 100644 --- a/source/blender/windowmanager/intern/wm_operator_props.c +++ b/source/blender/windowmanager/intern/wm_operator_props.c @@ -225,7 +225,7 @@ void WM_operator_properties_border_to_rctf(struct wmOperator *op, rctf *rect) } /** - * Use with #WM_border_select_invoke + * Use with #WM_gesture_border_invoke */ void WM_operator_properties_gesture_border(wmOperatorType *ot, bool extend) { diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 307c8b24c1e..42f13257095 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2312,7 +2312,7 @@ static void wm_gesture_end(bContext *C, wmOperator *op) } } -int WM_border_select_invoke(bContext *C, wmOperator *op, const wmEvent *event) +int WM_gesture_border_invoke(bContext *C, wmOperator *op, const wmEvent *event) { if (ISTWEAK(event->type)) op->customdata = WM_gesture_new(C, event, WM_GESTURE_RECT); @@ -2327,7 +2327,7 @@ int WM_border_select_invoke(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_RUNNING_MODAL; } -int WM_border_select_modal(bContext *C, wmOperator *op, const wmEvent *event) +int WM_gesture_border_modal(bContext *C, wmOperator *op, const wmEvent *event) { wmGesture *gesture = op->customdata; rcti *rect = gesture->customdata; @@ -2386,7 +2386,7 @@ int WM_border_select_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_RUNNING_MODAL; } -void WM_border_select_cancel(bContext *C, wmOperator *op) +void WM_gesture_border_cancel(bContext *C, wmOperator *op) { wm_gesture_end(C, op); } |