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

Fix: Incorrect Join/Docking Possible at Min Distance

Browse Source 
If you start an action zone drag close to the edge it is possible to
leave the source area yet be under the minimum distance. If you release
at this particular pixel distance it is possible to have an invalid
or unwanted join. This PR just assumes you have dragged enough if you
manage to leave the source area.

Pull Request: https://projects.blender.org/blender/blender/pulls/125266
This commit is contained in:
Harley Acheson
2024-07-23 02:30:05 +02:00
committed by Harley Acheson
parent 0fe0c04d2a
commit 2c4a611be1
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3803,6 +3803,10 @@ static AreaDockTarget area_docking_target(sAreaJoinData *jd, const wmEvent *even
return AreaDockTarget::None;
}
if (jd->sa1 == jd->sa2) {
return AreaDockTarget::None;
}
/* Convert to local coordinates in sa2. */
const int x = event->xy[0] + jd->win1->posx - jd->win2->posx - jd->sa2->totrct.xmin;
const int y = event->xy[1] + jd->win1->posy - jd->win2->posy - jd->sa2->totrct.ymin;
@@ -3848,7 +3852,7 @@ static AreaDockTarget area_docking_target(sAreaJoinData *jd, const wmEvent *even
}
/* Are we in the center? But not in same area! */
if (jd->sa1 != jd->sa2 && fac_x > 0.4f && fac_x < 0.6f && fac_y > 0.4f && fac_y < 0.6f) {
if (fac_x > 0.4f && fac_x < 0.6f && fac_y > 0.4f && fac_y < 0.6f) {
return AreaDockTarget::Center;
}
@@ -3925,15 +3929,17 @@ static void area_join_update_data(bContext *C, sAreaJoinData *jd, const wmEvent
return;
}
if (!(abs(jd->x - event->xy[0]) > (10 * U.pixelsize) ||
abs(jd->y - event->xy[1]) > (10 * U.pixelsize)))
{
jd->sa2 = area;
return;
}
if (jd->sa1 == area) {
jd->sa2 = area;
if (!(abs(jd->x - event->xy[0]) > (10 * U.pixelsize) ||
abs(jd->y - event->xy[1]) > (10 * U.pixelsize)))
{
/* We haven't moved enough to start a split. */
jd->dir = SCREEN_DIR_NONE;
jd->dock_target = AreaDockTarget::None;
return;
}
jd->split_dir = (abs(event->xy[0] - jd->x) > abs(event->xy[1] - jd->y)) ? SCREEN_AXIS_V :
SCREEN_AXIS_H;
jd->split_fac = area_split_factor(C, jd, event);