diff options
author | Julian Eisel <julian@blender.org> | 2020-05-26 16:38:37 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-05-26 16:42:50 +0300 |
commit | 4114e890202d92f683ec2fbe51183049932537d9 (patch) | |
tree | c16959ca7f1b7e83698326b89da5e253ed3a551d /source/blender/editors/interface | |
parent | d3275178fe329d91e27fd42c689de2254b946882 (diff) |
Fix overlapping tabs placement when used in right Top-bar split
Didn't respect alignment rules for split layouts.
Reported in T77075.
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_align.c | 6 |
1 files changed, 5 insertions, 1 deletions
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: |