Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2013-11-27 08:23:02 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2013-11-27 08:25:17 +0400
commitac088192d4fd574709e25c78d047f308e74e9423 (patch)
treea16f471234b68a1cd563c47906bc6a781318bdcf /source
parent3d6f3c04571379502a153bbc168389771609ba03 (diff)
Fix T37383: wrong spacing on Add menu in 3D view header.
This also was in the info header but less obvious, mistake in the layout engine.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/interface/interface_layout.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 3cd022bc640..85068998d9c 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -1881,7 +1881,7 @@ static int ui_litem_min_width(int itemw)
static void ui_litem_layout_row(uiLayout *litem)
{
uiItem *item;
- int x, y, w, tot, totw, neww, itemw, minw, itemh, offset;
+ int x, y, w, tot, totw, neww, newtotw, itemw, minw, itemh, offset;
int fixedw, freew, fixedx, freex, flag = 0, lastw = 0;
/* x = litem->x; */ /* UNUSED */
@@ -1908,6 +1908,7 @@ static void ui_litem_layout_row(uiLayout *litem)
freew = 0;
x = 0;
flag = 0;
+ newtotw = totw;
for (item = litem->items.first; item; item = item->next) {
if (item->flag)
@@ -1928,7 +1929,7 @@ static void ui_litem_layout_row(uiLayout *litem)
item->flag = 1;
fixedw += minw;
flag = 1;
- totw -= itemw;
+ newtotw -= itemw;
}
else {
/* keep free size */
@@ -1937,6 +1938,7 @@ static void ui_litem_layout_row(uiLayout *litem)
}
}
+ totw = newtotw;
lastw = fixedw;
} while (flag);