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

UI: Docking Split Order Areas As Previous

Browse Source 
Prior behavior for interactive area split would create the new area
immediately. If pulled from the top the new area would be above, while
if pulled from the bottom the new area would always be below. With
docking the split does not occur until the end, which would reverse
the area orders if the split was larger than 50%. This PR creates with
the old expected order, based on the starting position.

Pull Request: https://projects.blender.org/blender/blender/pulls/125338
This commit is contained in:
Harley Acheson
2024-07-23 23:13:22 +02:00
committed by Harley Acheson
parent b518172ae5
commit f6ae3bf8f3
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4017,13 +4017,36 @@ static int area_join_modal(bContext *C, wmOperator *op, const wmEvent *event)
else if (jd->sa1 && jd->sa1 == jd->sa2) {
/* Same area so split. */
if (area_split_allowed(jd->sa1, jd->split_dir) && jd->split_fac > 0.0001) {
jd->sa1 = area_split(jd->win2,
jd->sa2 = area_split(jd->win2,
WM_window_get_active_screen(jd->win1),
jd->sa1,
jd->split_dir,
jd->split_fac,
true);
const bool large_v = jd->split_dir == SCREEN_AXIS_V &&
((jd->x < event->xy[0] && jd->split_fac > 0.5f) ||
(jd->x > event->xy[0] && jd->split_fac < 0.5f));
const bool large_h = jd->split_dir == SCREEN_AXIS_H &&
((jd->y < event->xy[1] && jd->split_fac > 0.5f) ||
(jd->y > event->xy[1] && jd->split_fac < 0.5f));
if (large_v || large_h) {
/* Swap areas to follow old behavior of new area added based on starting location. If
* from above the new area is above, if from below the new area is below, etc. Note
* that this preserves runtime data, unlike ED_area_swapspace. */
std::swap(jd->sa1->v1, jd->sa2->v1);
std::swap(jd->sa1->v2, jd->sa2->v2);
std::swap(jd->sa1->v3, jd->sa2->v3);
std::swap(jd->sa1->v4, jd->sa2->v4);
std::swap(jd->sa1->totrct, jd->sa2->totrct);
std::swap(jd->sa1->winx, jd->sa2->winx);
std::swap(jd->sa1->winy, jd->sa2->winy);
}
ED_area_tag_redraw(jd->sa1);
ED_area_tag_redraw(jd->sa2);
}
}
else if (U.experimental.use_docking && jd->sa1 && jd->sa2 &&