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

UI: Do Not Allow Docking into Temp Windows

Browse Source 
Do not allow dragging screen areas into Temp windows, like Properties.

Pull Request: https://projects.blender.org/blender/blender/pulls/127379
This commit is contained in:
Harley Acheson
2024-09-10 02:43:07 +02:00
committed by Harley Acheson
parent 72a0be0944
commit 565f9f6b8a
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3853,6 +3853,13 @@ static int area_join_cursor(sAreaJoinData *jd, const wmEvent *event)
return WM_CURSOR_STOP;
}
if (jd->win2 && jd->win2->workspace_hook) {
bScreen *screen = BKE_workspace_active_screen_get(jd->win2->workspace_hook);
if (screen && screen->temp) {
return WM_CURSOR_STOP;
}
}
#if defined(__APPLE__)
const int move_cursor = WM_CURSOR_HAND_CLOSED;
#else
@@ -3947,6 +3954,13 @@ static AreaDockTarget area_docking_target(sAreaJoinData *jd, const wmEvent *even
return AreaDockTarget::None;
}
if (jd->win2 && jd->win2->workspace_hook) {
bScreen *screen = BKE_workspace_active_screen_get(jd->win2->workspace_hook);
if (screen && screen->temp) {
return AreaDockTarget::None;
}
}
/* Convert to local coordinates in sa2. */
int win1_posx = jd->win1->posx;
int win1_posy = jd->win1->posy;