diff options
author | Campbell Barton <campbell@blender.org> | 2022-03-04 05:31:16 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-03-04 05:31:16 +0300 |
commit | 0212c423bfaa4ccb82dca6259df084960f59944f (patch) | |
tree | b75fe7b2075cfdca277eb5dfe3f1489b7cab0f32 /source/blender/windowmanager | |
parent | 0a4fdcbb5fe3b33a276d2ab54a1e68db0fe24fd4 (diff) |
Cleanup: remove outdated references to tweak
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/WM_api.h | 10 | ||||
-rw-r--r-- | source/blender/windowmanager/WM_types.h | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/gizmo/WM_gizmo_types.h | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 5 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/wm.h | 2 |
7 files changed, 12 insertions, 13 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index ca2aaf4e208..aa380928082 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -796,14 +796,14 @@ void WM_operator_properties_select_walk_direction(struct wmOperatorType *ot); * For default click selection (with no modifier keys held), the select operators can do the * following: * - On a mouse press on an unselected item, change selection and finish immediately after. - * This sends an undo push and allows transform to take over should a tweak event be caught now. + * This sends an undo push and allows transform to take over should a click-drag event be caught. * - On a mouse press on a selected item, don't change selection state, but start modal execution * of the operator. Idea is that we wait with deselecting other items until we know that the * intention wasn't to tweak (mouse press+drag) all selected items. - * - If a tweak is recognized before the release event happens, cancel the operator, so that - * transform can take over and no undo-push is sent. - * - If the release event occurs rather than a tweak one, deselect all items but the one under the - * cursor, and finish the modal operator. + * - If a click-drag is recognized before the release event happens, cancel the operator, + * so that transform can take over and no undo-push is sent. + * - If the release event occurs rather than a click-drag one, + * deselect all items but the one under the cursor, and finish the modal operator. * * This utility, together with #WM_generic_select_invoke() and #WM_generic_select_modal() should * help getting the wanted behavior to work. Most generic logic should be handled in these, so that diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index 1f9f3e2c180..d7fe34a3b4c 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -273,7 +273,7 @@ enum { /** * #wmKeyMapItem.direction * - * Value of tweaks and line gestures. #KM_ANY (-1) works for this case too. + * Direction set for #KM_CLICK_DRAG key-map items. #KM_ANY (-1) to ignore direction. */ enum { KM_DIRECTION_N = 1, diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_types.h b/source/blender/windowmanager/gizmo/WM_gizmo_types.h index 03fafdd7d74..c69658c516c 100644 --- a/source/blender/windowmanager/gizmo/WM_gizmo_types.h +++ b/source/blender/windowmanager/gizmo/WM_gizmo_types.h @@ -136,7 +136,7 @@ typedef enum eWM_GizmoFlagGroupTypeFlag { * * The result for the user is tweak events delay the gizmo from flashing under the users cursor, * for selection operations. This means gizmos that use this check don't interfere - * with click drag events by popping up under the cursor and catching the tweak event. + * with click-drag events by popping up under the cursor and catching the drag-drag event. */ WM_GIZMOGROUPTYPE_DELAY_REFRESH_FOR_TWEAK = (1 << 9), diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c index 2971cdf40c3..b3ef9b27667 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c @@ -607,7 +607,7 @@ void GIZMOGROUP_OT_gizmo_tweak(wmOperatorType *ot) ot->invoke = gizmo_tweak_invoke; ot->modal = gizmo_tweak_modal; - /* TODO(campbell): This causes problems tweaking settings for operators, + /* TODO(@campbellbarton): This causes problems tweaking settings for operators, * need to find a way to support this. */ #if 0 ot->flag = OPTYPE_UNDO; diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index cd8be110c36..0e262f8c388 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -3156,7 +3156,7 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers) } if (ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE)) { - /* Test for #WM_CLICK_DRAG events. */ + /* Test for #KM_CLICK_DRAG events. */ /* NOTE(@campbellbarton): Needed so drag can be used for editors that support both click * selection and passing through the drag action to box select. See #WM_generic_select_modal. @@ -3224,8 +3224,7 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers) if (win->event_queue_check_drag) { if ((event->prev_click_type != event->type) && (ISKEYMODIFIER(event->type) || (event->type == event->prev_click_keymodifier))) { - /* Support releasing modifier keys without canceling the drag event, see T89989. - * NOTE: this logic is replicated for tweak gestures. */ + /* Support releasing modifier keys without canceling the drag event, see T89989. */ } else { win->event_queue_check_drag = false; diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 7e680af4537..0dce8b8f000 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -947,7 +947,7 @@ int WM_generic_select_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_FINISHED | OPERATOR_PASS_THROUGH; } /* Important not to return anything other than PASS_THROUGH here, - * otherwise it prevents underlying tweak detection code to work properly. */ + * otherwise it prevents underlying drag detection code to work properly. */ return OPERATOR_PASS_THROUGH; } diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h index 172a879e118..d7723978728 100644 --- a/source/blender/windowmanager/wm.h +++ b/source/blender/windowmanager/wm.h @@ -72,7 +72,7 @@ void wm_operatortypes_register(void); void wm_gesture_draw(struct wmWindow *win); /** - * Tweak and line gestures. + * Use for line gesture. */ void wm_gesture_tag_redraw(struct wmWindow *win); |