griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #59358: Don't Show Status Bar Impossible Confirms & Cancels

Browse Source 
When performing a transform operation that drags or tweaks, do not show
the Cancel or Confirm keymap item on the Status Bar if they use the
same mouse button that initiated the operation. For example if you are
RCS and are tweaking an object, don't show Cancel on status bar since
that requires right click. If LCS then don't show Confirm (requires
left click) when tweaking, dragging gizmo parts, etc.

Pull Request: https://projects.blender.org/blender/blender/pulls/131336
This commit is contained in:
Harley Acheson
2025-01-29 03:57:08 +01:00
committed by Harley Acheson
parent bd1ded952b
commit 867e9d879a
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/transform/transform.cc
View File

@@ -564,13 +564,19 @@ static bool transform_modal_item_poll(const wmOperator *op, int value)
}
}
switch (value) {
case TFM_MODAL_CANCEL: {
/* TODO: Canceling with LMB is not possible when the operator is activated
* through tweak and the LMB is pressed.
* Therefore, this item should not appear in the status bar. */
break;
/* You cannot cancel or confirm a "release on confirm" operation by clicking the same mouse
* button that you started it with. In this case the item should not appear on the status bar. */
if (t->flag & T_RELEASE_CONFIRM && ISMOUSE_BUTTON(t->launch_event) &&
ELEM(value, TFM_MODAL_CANCEL, TFM_MODAL_CONFIRM))
{
LISTBASE_FOREACH (const wmKeyMapItem *, kmi, &t->keymap->items) {
if (kmi->propvalue == value && kmi->type == t->launch_event && kmi->val == KM_PRESS) {
return false;
}
}
}
switch (value) {
case TFM_MODAL_PROPSIZE:
case TFM_MODAL_PROPSIZE_UP:
case TFM_MODAL_PROPSIZE_DOWN: {