[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25290] trunk/blender/source/blender: align option for split
Campbell Barton
ideasman42 at gmail.com
Thu Dec 10 15:47:07 CET 2009
Revision: 25290
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25290
Author: campbellbarton
Date: 2009-12-10 15:47:07 +0100 (Thu, 10 Dec 2009)
Log Message:
-----------
align option for split
Modified Paths:
--------------
trunk/blender/source/blender/editors/animation/fmodifier_ui.c
trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/interface/interface_utils.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/makesrna/intern/rna_sequence.c
trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
Modified: trunk/blender/source/blender/editors/animation/fmodifier_ui.c
===================================================================
--- trunk/blender/source/blender/editors/animation/fmodifier_ui.c 2009-12-10 14:32:37 UTC (rev 25289)
+++ trunk/blender/source/blender/editors/animation/fmodifier_ui.c 2009-12-10 14:47:07 UTC (rev 25290)
@@ -276,7 +276,7 @@
/* split into 2 columns
* NOTE: the mode comboboxes shouldn't get labels, otherwise there isn't enough room
*/
- split= uiLayoutSplit(layout, 0.5f);
+ split= uiLayoutSplit(layout, 0.5f, 0);
/* before range */
col= uiLayoutColumn(split, 1);
@@ -306,7 +306,7 @@
uiItemR(layout, NULL, 0, &ptr, "modification", 0);
/* split into 2 columns */
- split= uiLayoutSplit(layout, 0.5f);
+ split= uiLayoutSplit(layout, 0.5f, 0);
/* col 1 */
col= uiLayoutColumn(split, 0);
@@ -588,7 +588,7 @@
row= uiLayoutRow(layout, 0);
/* split into 2 columns */
- split= uiLayoutSplit(layout, 0.5f);
+ split= uiLayoutSplit(layout, 0.5f, 0);
/* x-minimum */
col= uiLayoutColumn(split, 1);
@@ -606,7 +606,7 @@
row= uiLayoutRow(layout, 0);
/* split into 2 columns */
- split= uiLayoutSplit(layout, 0.5f);
+ split= uiLayoutSplit(layout, 0.5f, 0);
/* x-minimum */
col= uiLayoutColumn(split, 1);
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c 2009-12-10 14:32:37 UTC (rev 25289)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c 2009-12-10 14:47:07 UTC (rev 25290)
@@ -187,7 +187,7 @@
/* new backdrop ----------------------------------- */
box= uiLayoutBox(layout);
- split= uiLayoutSplit(box, 0.5f);
+ split= uiLayoutSplit(box, 0.5f, 0);
/* draw settings ---------------------------------- */
Modified: trunk/blender/source/blender/editors/include/UI_interface.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_interface.h 2009-12-10 14:32:37 UTC (rev 25289)
+++ trunk/blender/source/blender/editors/include/UI_interface.h 2009-12-10 14:47:07 UTC (rev 25290)
@@ -629,7 +629,7 @@
uiLayout *uiLayoutListBox(uiLayout *layout, struct PointerRNA *ptr, struct PropertyRNA *prop,
struct PointerRNA *actptr, struct PropertyRNA *actprop);
uiLayout *uiLayoutAbsolute(uiLayout *layout, int align);
-uiLayout *uiLayoutSplit(uiLayout *layout, float percentage);
+uiLayout *uiLayoutSplit(uiLayout *layout, float percentage, int align);
uiLayout *uiLayoutOverlap(uiLayout *layout);
uiBlock *uiLayoutAbsoluteBlock(uiLayout *layout);
Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_layout.c 2009-12-10 14:32:37 UTC (rev 25289)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c 2009-12-10 14:47:07 UTC (rev 25290)
@@ -714,7 +714,7 @@
if(prop && RNA_property_type(prop) == PROP_ENUM) {
EnumPropertyItem *item;
int totitem, i, free;
- uiLayout *split= uiLayoutSplit(layout, 0);
+ uiLayout *split= uiLayoutSplit(layout, 0, 0);
uiLayout *column= uiLayoutColumn(split, 0);
RNA_property_enum_items(block->evil_C, &ptr, prop, &item, &totitem, &free);
@@ -1024,7 +1024,7 @@
if(RNA_property_type(prop) == PROP_ENUM) {
EnumPropertyItem *item;
int totitem, i, free;
- uiLayout *split= uiLayoutSplit(layout, 0);
+ uiLayout *split= uiLayoutSplit(layout, 0, 0);
uiLayout *column= uiLayoutColumn(split, 0);
RNA_property_enum_items(block->evil_C, ptr, prop, &item, &totitem, &free);
@@ -2088,13 +2088,14 @@
return litem;
}
-uiLayout *uiLayoutSplit(uiLayout *layout, float percentage)
+uiLayout *uiLayoutSplit(uiLayout *layout, float percentage, int align)
{
uiLayoutItemSplt *split;
split= MEM_callocN(sizeof(uiLayoutItemSplt), "uiLayoutItemSplt");
split->litem.item.type= ITEM_LAYOUT_SPLIT;
split->litem.root= layout->root;
+ split->litem.align= align;
split->litem.active= 1;
split->litem.enabled= 1;
split->litem.context= layout->context;
Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c 2009-12-10 14:32:37 UTC (rev 25289)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c 2009-12-10 14:47:07 UTC (rev 25290)
@@ -1377,7 +1377,7 @@
}
/* create items */
- split= uiLayoutSplit(layout, 0);
+ split= uiLayoutSplit(layout, 0, 0);
for(a=0, b=0; a<md->nitems; a++, b++) {
if(block->flag & UI_BLOCK_NO_FLIP)
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c 2009-12-10 14:32:37 UTC (rev 25289)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c 2009-12-10 14:47:07 UTC (rev 25290)
@@ -1864,7 +1864,7 @@
/* black/white levels */
if(levels) {
- split= uiLayoutSplit(layout, 0);
+ split= uiLayoutSplit(layout, 0, 0);
uiItemR(uiLayoutColumn(split, 0), NULL, 0, ptr, "black_level", UI_ITEM_R_EXPAND);
uiItemR(uiLayoutColumn(split, 0), NULL, 0, ptr, "white_level", UI_ITEM_R_EXPAND);
@@ -2098,7 +2098,7 @@
else if(itemptr->type == &RNA_ShapeKey) {
ob= (Object*)activeptr->data;
- split= uiLayoutSplit(sub, 0.75f);
+ split= uiLayoutSplit(sub, 0.75f, 0);
uiItemL(split, name, icon);
Modified: trunk/blender/source/blender/editors/interface/interface_utils.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_utils.c 2009-12-10 14:32:37 UTC (rev 25289)
+++ trunk/blender/source/blender/editors/interface/interface_utils.c 2009-12-10 14:47:07 UTC (rev 25290)
@@ -151,7 +151,7 @@
uiItemL(col, name, 0);
}
else if(columns == 2) {
- split = uiLayoutSplit(layout, 0.5f);
+ split = uiLayoutSplit(layout, 0.5f, 0);
uiItemL(uiLayoutColumn(split, 0), name, 0);
col= uiLayoutColumn(split, 0);
Modified: trunk/blender/source/blender/editors/space_image/image_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_buttons.c 2009-12-10 14:32:37 UTC (rev 25289)
+++ trunk/blender/source/blender/editors/space_image/image_buttons.c 2009-12-10 14:47:07 UTC (rev 25290)
@@ -1024,7 +1024,7 @@
if(ima->source != IMA_SRC_GENERATED) {
uiItemS(layout);
- split= uiLayoutSplit(layout, 0);
+ split= uiLayoutSplit(layout, 0, 0);
col= uiLayoutColumn(split, 0);
uiItemR(col, NULL, 0, &imaptr, "fields", 0);
@@ -1040,7 +1040,7 @@
if(ELEM(ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) {
uiItemS(layout);
- split= uiLayoutSplit(layout, 0);
+ split= uiLayoutSplit(layout, 0, 0);
col= uiLayoutColumn(split, 0);
@@ -1062,7 +1062,7 @@
uiItemR(col, NULL, 0, userptr, "cyclic", 0);
}
else if(ima->source==IMA_SRC_GENERATED) {
- split= uiLayoutSplit(layout, 0);
+ split= uiLayoutSplit(layout, 0, 0);
col= uiLayoutColumn(split, 1);
uiItemR(col, "X", 0, &imaptr, "generated_width", 0);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c 2009-12-10 14:32:37 UTC (rev 25289)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c 2009-12-10 14:47:07 UTC (rev 25290)
@@ -502,7 +502,7 @@
{
uiLayout *split, *colsub;
- split = uiLayoutSplit(layout, 0.8);
+ split = uiLayoutSplit(layout, 0.8, 0);
if (ptr->type == &RNA_PoseBone) {
PointerRNA boneptr;
@@ -518,7 +518,7 @@
uiItemL(colsub, "", 0);
uiItemR(colsub, "", ICON_LOCKED, ptr, "lock_location", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY);
- split = uiLayoutSplit(layout, 0.8);
+ split = uiLayoutSplit(layout, 0.8, 0);
switch(RNA_enum_get(ptr, "rotation_mode")) {
case ROT_MODE_QUAT: /* quaternion */
@@ -553,7 +553,7 @@
}
uiItemR(layout, "", 0, ptr, "rotation_mode", 0);
- split = uiLayoutSplit(layout, 0.8);
+ split = uiLayoutSplit(layout, 0.8, 0);
colsub = uiLayoutColumn(split, 1);
uiItemR(colsub, "Scale", 0, ptr, "scale", 0);
colsub = uiLayoutColumn(split, 1);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_select.c 2009-12-10 14:32:37 UTC (rev 25289)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_select.c 2009-12-10 14:47:07 UTC (rev 25290)
@@ -908,7 +908,7 @@
/* UI */
uiPopupMenu *pup= uiPupMenuBegin(C, "Select Object", 0);
uiLayout *layout= uiPupMenuLayout(pup);
- uiLayout *split= uiLayoutSplit(layout, 0);
+ uiLayout *split= uiLayoutSplit(layout, 0, 0);
uiLayout *column= uiLayoutColumn(split, 0);
LinkNode *node;
Modified: trunk/blender/source/blender/makesrna/intern/rna_sequence.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sequence.c 2009-12-10 14:32:37 UTC (rev 25289)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequence.c 2009-12-10 14:47:07 UTC (rev 25290)
@@ -1155,7 +1155,7 @@
{
StructRNA *srna;
PropertyRNA *prop;
-
+
srna = RNA_def_struct(brna, "ColorSequence", "EffectSequence");
RNA_def_struct_ui_text(srna, "Color Sequence", "Sequence strip creating an image filled with a single color.");
RNA_def_struct_sdna_from(srna, "SolidColorVars", "effectdata");
Modified: trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_ui_api.c 2009-12-10 14:32:37 UTC (rev 25289)
+++ trunk/blender/source/blender/makesrna/intern/rna_ui_api.c 2009-12-10 14:47:07 UTC (rev 25290)
@@ -145,6 +145,7 @@
parm= RNA_def_pointer(func, "layout", "UILayout", "", "Sub-layout to put items in.");
RNA_def_function_return(func, parm);
RNA_def_float(func, "percentage", 0.0f, 0.0f, 1.0f, "Percentage", "Percentage of width to split at.", 0.0f, 1.0f);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list