blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

Fix T37847: some buttons displayed too wide in multi-column menus.

This commit is contained in:
Brecht Van Lommel 2013-12-18 19:33:54 +01:00
parent 3f2f7091d6
commit 4b206af1c9
Notes: blender-bot 2023-02-14 19:34:20 +01:00 
Referenced by issue #54054, Bmesh boolean modifier fails with co-planar geometry (carve doesn't)
Referenced by issue #44781, UV Pack islands gives unpredictable results
Referenced by issue #43302, Error when opening Blender
Referenced by issue #43100, cycles material crash
Referenced by issue #39610, Shared mesh used for Mesh Deform causes crash
Referenced by issue #38501, blender crashes right after adding image texture to material in cycles
Referenced by issue #38507, Inset Faces tool, offset even option doesn't work anymore
Referenced by issue #38258, black spots
Referenced by issue #38225, (complete) System Freeze, Frequent
Referenced by issue #38226, critical 3d view transform and manipulator issues.
Referenced by issue #38083, Submenu arrow is overlayed by menu item hotkey
Referenced by issue #38003, Crash through Offset (Arraymodifier)
Referenced by issue #37984, Blender crashes when packed image is used in a cycles node shader.
Referenced by issue #37987, Blender goes into an infinite loop when opening a file
Referenced by issue #37956, Lightdistance
Referenced by issue #37934, Solidify Modifier Problem
Referenced by issue #37940, Curve Render bug in Blender Internal Render.
Referenced by issue #37913, Cycles transparent shader behaving differently with same image but different setup
Referenced by issue #37916, Mirror+Bevel modifiers produce incorrect result.
Referenced by issue #37885, Gravity feature with Dynamic topology enabled sculpt crashes blender
Referenced by issue #37847, Tracking > Track to highlight
Referenced by issue blender/blender-addons#53136, Paint palletes import robustness
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/interface/interface.c
View File

@ -230,13 +230,7 @@ static void ui_text_bounds_block(uiBlock *block, float offset)
/* cope with multi collumns */
bt = block->buttons.first;
while (bt) {
if (bt->next && bt->rect.xmin < bt->next->rect.xmin) {
nextcol = 1;
col++;
}
else {
nextcol = 0;
}
nextcol = (bt->next && bt->rect.xmin < bt->next->rect.xmin);
bt->rect.xmin = x1addval;
bt->rect.xmax = bt->rect.xmin + i + block->bounds;
@ -247,8 +241,10 @@ static void ui_text_bounds_block(uiBlock *block, float offset)
ui_check_but(bt); /* clips text again */
if (nextcol)
if (nextcol) {
x1addval += i + block->bounds;
col++;
}
bt = bt->next;
}