blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

UI: Screen Area Docking #104665

Open
Harley Acheson wants to merge 12 commits from Harley/blender:Docking into main
pull from: Harley/blender:Docking
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 8 Commits 12 Files Changed 3 +19 -4
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 957168dbbd - Show all commits

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

@ -3594,7 +3594,7 @@ static int area_join_cursor(sAreaJoinData *jd, const wmEvent *event)
if (event->xy[0] < 0 || event->xy[0] > jd->win1->sizex || event->xy[1] < 1 ||
event->xy[1] > jd->win1->sizey)
{
return WM_CURSOR_HAND;
return WM_CURSOR_PICK_AREA;
}
return WM_CURSOR_STOP;
}
@ -3609,11 +3609,26 @@ static int area_join_cursor(sAreaJoinData *jd, const wmEvent *event)
}
}
if (jd->join_dir != SCREEN_DIR_NONE || jd->dock_target != DOCKING_NONE) {
return WM_CURSOR_HAND;
if (jd->dock_target == DOCKING_NONE) {
if (jd->join_dir == SCREEN_DIR_N) {
return WM_CURSOR_N_ARROW;
}
if (jd->join_dir == SCREEN_DIR_S) {
return WM_CURSOR_S_ARROW;
}
if (jd->join_dir == SCREEN_DIR_W) {
return WM_CURSOR_W_ARROW;
}
if (jd->join_dir == SCREEN_DIR_E) {
return WM_CURSOR_E_ARROW;
}
}
return WM_CURSOR_HAND;
if (jd->join_dir != SCREEN_DIR_NONE || jd->dock_target != DOCKING_NONE) {
return WM_CURSOR_PICK_AREA;
}
return WM_CURSOR_PICK_AREA;
}
static eAreaDockTarget area_docking_target(sAreaJoinData *jd, const wmEvent *event)