[Bf-blender-cvs] [43299f9465] master: Columns should be expandable by default

raa noreply at git.blender.org
Wed Feb 22 22:10:40 CET 2017


Commit: 43299f9465aa7ae6ae66f70a70aaea455280e90a
Author: raa
Date:   Thu Feb 23 00:03:31 2017 +0300
Branches: master
https://developer.blender.org/rB43299f9465aa7ae6ae66f70a70aaea455280e90a

Columns should be expandable by default

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

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 78860206c2..9acc8cf827 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -2216,7 +2216,6 @@ static void ui_litem_estimate_column(uiLayout *litem)
 {
 	uiItem *item;
 	int itemw, itemh;
-	bool min_size_flag = true;
 
 	litem->w = 0;
 	litem->h = 0;
@@ -2224,18 +2223,12 @@ static void ui_litem_estimate_column(uiLayout *litem)
 	for (item = litem->items.first; item; item = item->next) {
 		ui_item_size(item, &itemw, &itemh);
 
-		min_size_flag = min_size_flag && (item->flag & UI_ITEM_MIN);
-
 		litem->w = MAX2(litem->w, itemw);
 		litem->h += itemh;
 
 		if (item->next)
 			litem->h += litem->space;
 	}
-
-	if (min_size_flag) {
-		litem->item.flag |= UI_ITEM_MIN;
-	}
 }
 
 static void ui_litem_layout_column(uiLayout *litem)




More information about the Bf-blender-cvs mailing list