blender/blender
152
489
Fork 720
Code Issues 6.8k Pull Requests 894 Projects 18 Wiki Activity

UI: Add Snapping to Docking Split Status #125990

Merged
Harley Acheson merged 1 commits from Harley/blender:DockingSplitSnap into main 2024-08-06 22:32:05 +02:00
Conversation 1 Commits 1 Files Changed 1 +9 -5
1 changed files with 9 additions and 5 deletions
Show Stats 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: