[Bf-blender-cvs] [f1c764fd8f] master: Fix width calculation for split layouts

[raa]

Commit: f1c764fd8fe965c670823d91b367549e9173d56e
Author: raa
Date:   Mon Mar 6 16:35:56 2017 +0300
Branches: master
https://developer.blender.org/rBf1c764fd8fe965c670823d91b367549e9173d56e

Fix width calculation for split layouts

===================================================================

M       source/blender/editors/interface/interface_layout.c

===================================================================

diff --git a/source/blender/editors/interface/interface_layout.c 
b/source/blender/editors/interface/interface_layout.c
index ad5f627960..ce1153911d 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -2681,13 +2681,14 @@ static void ui_litem_layout_absolute(uiLayout *litem)
 static void ui_litem_estimate_split(uiLayout *litem)
 {
        ui_litem_estimate_row(litem);
+       litem->item.flag &= ~UI_ITEM_MIN;
 }
 
 static void ui_litem_layout_split(uiLayout *litem)
 {
        uiLayoutItemSplit *split = (uiLayoutItemSplit *)litem;
        uiItem *item;
-       float percentage;
+       float percentage, extra_pixel = 0.0f;
        const int tot = BLI_listbase_count(&litem->items);
        int itemh, x, y, w, colw = 0;
 
@@ -2710,7 +2711,9 @@ static void ui_litem_layout_split(uiLayout *litem)
                x += colw;
 
                if (item->next) {
-                       colw = (w - (int)(w * percentage)) / (tot - 1);
+                       const float width = extra_pixel + (w - (int)(w * 
percentage)) / ((float)tot - 1);
+                       extra_pixel = width - (int)width;
+                       colw = (int)width;
                        colw = MAX2(colw, 0);
 
                        x += litem->space;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs