diff options
| author | Ton Roosendaal <ton@blender.org> | 2010-11-22 21:11:40 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2010-11-22 21:11:40 +0300 |
| commit | 739b8f6a5ce0790a762b53e213471e6c7ac3f495 (patch) | |
| tree | 9869f24e32b7b45cfba2fe25c73d4fcbb4bf09b3 /source/blender/editors | |
| parent | 1d468c75e708bd992d507db12925e0b185556791 (diff) | |
Bugfix #24856
Button aligning revisited. Now layer buttons draw OK too, and even
better than before (missed a rounded corner!)
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index bad4b629039..fc2e7ce76d6 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -2262,14 +2262,17 @@ static void ui_block_do_align_but(uiBut *first, int nr) else { /* next button switches to new row */ if(prev && buts_are_horiz(prev, but)) - flag |= UI_BUT_ALIGN_LEFT; + flag |= UI_BUT_ALIGN_LEFT; + else + flag |= UI_BUT_ALIGN_TOP; if( (flag & UI_BUT_ALIGN_TOP)==0) { /* stil top row */ if(prev) { if(next && buts_are_horiz(but, next)) - flag = UI_BUT_ALIGN_DOWN|UI_BUT_ALIGN_RIGHT; + flag = UI_BUT_ALIGN_DOWN|UI_BUT_ALIGN_LEFT|UI_BUT_ALIGN_RIGHT; else { - flag = UI_BUT_ALIGN_DOWN|UI_BUT_ALIGN_TOP; + /* last button in top row */ + flag = UI_BUT_ALIGN_DOWN|UI_BUT_ALIGN_LEFT; } } else |