[Bf-blender-cvs] [4114e890202] blender-v2.83-release: Fix overlapping tabs placement when used in right Top-bar split
Julian Eisel
noreply at git.blender.org
Tue May 26 15:43:00 CEST 2020
Commit: 4114e890202d92f683ec2fbe51183049932537d9
Author: Julian Eisel
Date: Tue May 26 15:38:37 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB4114e890202d92f683ec2fbe51183049932537d9
Fix overlapping tabs placement when used in right Top-bar split
Didn't respect alignment rules for split layouts.
Reported in T77075.
===================================================================
M source/blender/editors/interface/interface_align.c
===================================================================
diff --git a/source/blender/editors/interface/interface_align.c b/source/blender/editors/interface/interface_align.c
index 09811fab52d..acbdf564054 100644
--- a/source/blender/editors/interface/interface_align.c
+++ b/source/blender/editors/interface/interface_align.c
@@ -124,7 +124,11 @@ bool ui_but_can_align(const uiBut *but)
int ui_but_align_opposite_to_area_align_get(const ARegion *region)
{
- switch (RGN_ALIGN_ENUM_FROM_MASK(region->alignment)) {
+ const ARegion *align_region = (region->alignment & RGN_SPLIT_PREV && region->prev) ?
+ region->prev :
+ region;
+
+ switch (RGN_ALIGN_ENUM_FROM_MASK(align_region->alignment)) {
case RGN_ALIGN_TOP:
return UI_BUT_ALIGN_DOWN;
case RGN_ALIGN_BOTTOM:
More information about the Bf-blender-cvs
mailing list