Fix #110848: Trackpad: Allow changing the speed while fly navigating #110930
@ -6356,7 +6356,7 @@ def km_view3d_fly_modal(_params):
|
|||||||
("DECELERATE", {"type": 'NUMPAD_MINUS', "value": 'PRESS', "any": True, "repeat": True}, None),
|
("DECELERATE", {"type": 'NUMPAD_MINUS', "value": 'PRESS', "any": True, "repeat": True}, None),
|
||||||
("ACCELERATE", {"type": 'WHEELUPMOUSE', "value": 'PRESS', "any": True}, None),
|
("ACCELERATE", {"type": 'WHEELUPMOUSE', "value": 'PRESS', "any": True}, None),
|
||||||
("DECELERATE", {"type": 'WHEELDOWNMOUSE', "value": 'PRESS', "any": True}, None),
|
("DECELERATE", {"type": 'WHEELDOWNMOUSE', "value": 'PRESS', "any": True}, None),
|
||||||
("CONFIRM", {"type": 'TRACKPADPAN', "value": 'ANY'}, None),
|
("SPEED", {"type": 'TRACKPADPAN', "value": 'ANY'}, None),
|
||||||
("PAN_ENABLE", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "any": True}, None),
|
("PAN_ENABLE", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "any": True}, None),
|
||||||
("PAN_DISABLE", {"type": 'MIDDLEMOUSE', "value": 'RELEASE', "any": True}, None),
|
("PAN_DISABLE", {"type": 'MIDDLEMOUSE', "value": 'RELEASE', "any": True}, None),
|
||||||
("FORWARD", {"type": 'W', "value": 'PRESS', "repeat": True}, None),
|
("FORWARD", {"type": 'W', "value": 'PRESS', "repeat": True}, None),
|
||||||
|
@ -119,6 +119,7 @@ void fly_modal_keymap(wmKeyConfig *keyconf)
|
|||||||
{FLY_MODAL_FREELOOK_ENABLE, "FREELOOK_ENABLE", 0, "Rotation", ""},
|
{FLY_MODAL_FREELOOK_ENABLE, "FREELOOK_ENABLE", 0, "Rotation", ""},
|
||||||
{FLY_MODAL_FREELOOK_DISABLE, "FREELOOK_DISABLE", 0, "Rotation (Off)", ""},
|
{FLY_MODAL_FREELOOK_DISABLE, "FREELOOK_DISABLE", 0, "Rotation (Off)", ""},
|
||||||
|
|
||||||
|
{FLY_MODAL_SPEED, "SPEED", 0, "Speed", ""},
|
||||||
{0, nullptr, 0, nullptr, nullptr},
|
{0, nullptr, 0, nullptr, nullptr},
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -1098,10 +1099,9 @@ static int fly_modal(bContext *C, wmOperator *op, const wmEvent *event)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif /* WITH_INPUT_NDOF */
|
#endif /* WITH_INPUT_NDOF */
|
||||||
if (event->type == TIMER && event->customdata == fly->timer)
|
if (event->type == TIMER && event->customdata == fly->timer) {
|
||||||
{
|
flyApply(C, fly, false);
|
||||||
flyApply(C, fly, false);
|
}
|
||||||
}
|
|
||||||
|
|
||||||
do_draw |= fly->redraw;
|
do_draw |= fly->redraw;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user