[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30602] branches/soc-2008-mxcurioni/source /blender/editors/interface/interface_layout.c: Temporary fix for a bug that the width of a layout object is not propagated

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Thu Jul 22 01:17:37 CEST 2010


Revision: 30602
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30602
Author:   kjym3
Date:     2010-07-22 01:17:37 +0200 (Thu, 22 Jul 2010)

Log Message:
-----------
Temporary fix for a bug that the width of a layout object is not propagated
to its sub-layout objects such as row, column, box, etc.  Due to this bug,
layout.template_curve_mapping() shows a zero-height curve window when the
function is called with respect to a sub-layout object.  This issue should
be fixed in the trunk as well.

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c

Modified: branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c	2010-07-21 23:08:10 UTC (rev 30601)
+++ branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c	2010-07-21 23:17:37 UTC (rev 30602)
@@ -2002,6 +2002,7 @@
 	litem->enabled= 1;
 	litem->context= layout->context;
 	litem->space= (align)? 0: layout->root->style->buttonspacex;
+	litem->w = layout->w;
 	BLI_addtail(&layout->items, litem);
 
 	uiBlockSetCurLayout(layout->root->block, litem);
@@ -2021,6 +2022,7 @@
 	litem->enabled= 1;
 	litem->context= layout->context;
 	litem->space= (litem->align)? 0: layout->root->style->buttonspacey;
+	litem->w = layout->w;
 	BLI_addtail(&layout->items, litem);
 
 	uiBlockSetCurLayout(layout->root->block, litem);
@@ -2040,6 +2042,7 @@
 	flow->litem.enabled= 1;
 	flow->litem.context= layout->context;
 	flow->litem.space= (flow->litem.align)? 0: layout->root->style->columnspace;
+	flow->litem.w = layout->w;
 	flow->number= number;
 	BLI_addtail(&layout->items, flow);
 
@@ -2059,6 +2062,7 @@
 	box->litem.enabled= 1;
 	box->litem.context= layout->context;
 	box->litem.space= layout->root->style->columnspace;
+	box->litem.w = layout->w;
 	BLI_addtail(&layout->items, box);
 
 	uiBlockSetCurLayout(layout->root->block, &box->litem);





More information about the Bf-blender-cvs mailing list