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

UI: Add Snapping to Docking Split Status

Browse Source 
While docking, dragging into the source area allows split. Holding Ctrl
causes snapping just like when not docking. This PR just includes this
in the status bar keymap info while doing so.

Pull Request: https://projects.blender.org/blender/blender/pulls/125990
This commit is contained in:
Harley Acheson
2024-08-06 22:30:53 +02:00
committed by Harley Acheson
parent eba9771ef2
commit 223d68a733
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/screen/screen_ops.cc
View File

@@ -4031,14 +4031,18 @@ static int area_join_modal(bContext *C, wmOperator *op, const wmEvent *event)
WorkspaceStatus status(C);
if (jd->sa1 && jd->sa1 == jd->sa2) {
status.item(IFACE_("Select Split"), ICON_MOUSE_LMB);
}
else if (jd->dock_target == AreaDockTarget::None) {
status.item(IFACE_("Select Area"), ICON_MOUSE_LMB);
status.item(IFACE_("Cancel"), ICON_EVENT_ESC);
status.item_bool(IFACE_("Snap"), event->modifier & KM_CTRL, ICON_EVENT_CTRL);
}
else {
status.item(IFACE_("Select Location"), ICON_MOUSE_LMB);
if (jd->dock_target == AreaDockTarget::None) {
status.item(IFACE_("Select Area"), ICON_MOUSE_LMB);
}
else {
status.item(IFACE_("Select Location"), ICON_MOUSE_LMB);
}
status.item(IFACE_("Cancel"), ICON_EVENT_ESC);
}
status.item(IFACE_("Cancel"), ICON_EVENT_ESC);
break;
}
case LEFTMOUSE: