diff options
Diffstat (limited to 'source/blender/editors/interface/interface_layout.c')
| -rw-r--r-- | source/blender/editors/interface/interface_layout.c | 1236 |
1 files changed, 618 insertions, 618 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 88db06c5ec3..91e38e7d914 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -60,11 +60,11 @@ /************************ Structs and Defines *************************/ -#define RNA_NO_INDEX -1 -#define RNA_ENUM_VALUE -2 +#define RNA_NO_INDEX -1 +#define RNA_ENUM_VALUE -2 -#define EM_SEPR_X 6 -#define EM_SEPR_Y 6 +#define EM_SEPR_X 6 +#define EM_SEPR_Y 6 #define UI_OPERATOR_ERROR_RET(_ot, _opname, return_statement) \ if (ot == NULL) { \ @@ -170,12 +170,12 @@ typedef struct uiLayoutItemRoot { static const char *ui_item_name_add_colon(const char *name, char namestr[UI_MAX_NAME_STR]) { - int len= strlen(name); + int len = strlen(name); - if (len != 0 && len+1 < UI_MAX_NAME_STR) { + if (len != 0 && len + 1 < UI_MAX_NAME_STR) { BLI_strncpy(namestr, name, UI_MAX_NAME_STR); - namestr[len]= ':'; - namestr[len+1]= '\0'; + namestr[len] = ':'; + namestr[len + 1] = '\0'; return namestr; } @@ -189,22 +189,22 @@ static int ui_item_fit(int item, int pos, int all, int available, int last, int return item; if (offset) - *offset= 0; + *offset = 0; if (all > available) { /* contents is bigger than available space */ if (last) - return available-pos; + return available - pos; else - return (item*available)/all; + return (item * available) / all; } else { /* contents is smaller or equal to available space */ if (alignment == UI_LAYOUT_ALIGN_EXPAND) { if (last) - return available-pos; + return available - pos; else - return (item*available)/all; + return (item * available) / all; } else return item; @@ -212,12 +212,12 @@ static int ui_item_fit(int item, int pos, int all, int available, int last, int } /* variable button size in which direction? */ -#define UI_ITEM_VARY_X 1 -#define UI_ITEM_VARY_Y 2 +#define UI_ITEM_VARY_X 1 +#define UI_ITEM_VARY_Y 2 static int ui_layout_vary_direction(uiLayout *layout) { - return (layout->root->type == UI_LAYOUT_HEADER || layout->alignment != UI_LAYOUT_ALIGN_EXPAND)? UI_ITEM_VARY_X: UI_ITEM_VARY_Y; + return (layout->root->type == UI_LAYOUT_HEADER || layout->alignment != UI_LAYOUT_ALIGN_EXPAND) ? UI_ITEM_VARY_X : UI_ITEM_VARY_Y; } /* estimated size of text + icon */ @@ -226,62 +226,62 @@ static int ui_text_icon_width(uiLayout *layout, const char *name, int icon, int int variable = ui_layout_vary_direction(layout) == UI_ITEM_VARY_X; if (icon && !name[0]) - return UI_UNIT_X; /* icon only */ + return UI_UNIT_X; /* icon only */ else if (icon) - return (variable)? UI_GetStringWidth(name) + (compact? 5: 10) + UI_UNIT_X: 10*UI_UNIT_X; /* icon + text */ + return (variable) ? UI_GetStringWidth(name) + (compact ? 5 : 10) + UI_UNIT_X : 10 * UI_UNIT_X; /* icon + text */ else - return (variable)? UI_GetStringWidth(name) + (compact? 5: 10) + UI_UNIT_X: 10*UI_UNIT_X; /* text only */ + return (variable) ? UI_GetStringWidth(name) + (compact ? 5 : 10) + UI_UNIT_X : 10 * UI_UNIT_X; /* text only */ } static void ui_item_size(uiItem *item, int *r_w, int *r_h) { if (item->type == ITEM_BUTTON) { - uiButtonItem *bitem= (uiButtonItem*)item; + uiButtonItem *bitem = (uiButtonItem *)item; - if (r_w) *r_w= bitem->but->x2 - bitem->but->x1; - if (r_h) *r_h= bitem->but->y2 - bitem->but->y1; + if (r_w) *r_w = bitem->but->x2 - bitem->but->x1; + if (r_h) *r_h = bitem->but->y2 - bitem->but->y1; } else { - uiLayout *litem= (uiLayout*)item; + uiLayout *litem = (uiLayout *)item; - if (r_w) *r_w= litem->w; - if (r_h) *r_h= litem->h; + if (r_w) *r_w = litem->w; + if (r_h) *r_h = litem->h; } } static void ui_item_offset(uiItem *item, int *r_x, int *r_y) { if (item->type == ITEM_BUTTON) { - uiButtonItem *bitem= (uiButtonItem*)item; + uiButtonItem *bitem = (uiButtonItem *)item; - if (r_x) *r_x= bitem->but->x1; - if (r_y) *r_y= bitem->but->y1; + if (r_x) *r_x = bitem->but->x1; + if (r_y) *r_y = bitem->but->y1; } else { - if (r_x) *r_x= 0; - if (r_y) *r_y= 0; + if (r_x) *r_x = 0; + if (r_y) *r_y = 0; } } static void ui_item_position(uiItem *item, int x, int y, int w, int h) { if (item->type == ITEM_BUTTON) { - uiButtonItem *bitem= (uiButtonItem*)item; + uiButtonItem *bitem = (uiButtonItem *)item; - bitem->but->x1= x; - bitem->but->y1= y; - bitem->but->x2= x+w; - bitem->but->y2= y+h; + bitem->but->x1 = x; + bitem->but->y1 = y; + bitem->but->x2 = x + w; + bitem->but->y2 = y + h; ui_check_but(bitem->but); /* for strlen */ } else { - uiLayout *litem= (uiLayout*)item; + uiLayout *litem = (uiLayout *)item; - litem->x= x; - litem->y= y+h; - litem->w= w; - litem->h= h; + litem->x = x; + litem->y = y + h; + litem->w = w; + litem->h = h; } } @@ -289,7 +289,7 @@ static void ui_item_position(uiItem *item, int x, int y, int w, int h) static int ui_layout_local_dir(uiLayout *layout) { - switch(layout->item.type) { + switch (layout->item.type) { case ITEM_LAYOUT_ROW: case ITEM_LAYOUT_ROOT: case ITEM_LAYOUT_OVERLAP: @@ -309,34 +309,34 @@ static uiLayout *ui_item_local_sublayout(uiLayout *test, uiLayout *layout, int a uiLayout *sub; if (ui_layout_local_dir(test) == UI_LAYOUT_HORIZONTAL) - sub= uiLayoutRow(layout, align); + sub = uiLayoutRow(layout, align); else - sub= uiLayoutColumn(layout, align); + sub = uiLayoutColumn(layout, align); - sub->space= 0; + sub->space = 0; return sub; } static void ui_layer_but_cb(bContext *C, void *arg_but, void *arg_index) { - wmWindow *win= CTX_wm_window(C); - uiBut *but= arg_but, *cbut; - PointerRNA *ptr= &but->rnapoin; - PropertyRNA *prop= but->rnaprop; - int i, index= GET_INT_FROM_POINTER(arg_index); - int shift= win->eventstate->shift; - int len= RNA_property_array_length(ptr, prop); + wmWindow *win = CTX_wm_window(C); + uiBut *but = arg_but, *cbut; + PointerRNA *ptr = &but->rnapoin; + PropertyRNA *prop = but->rnaprop; + int i, index = GET_INT_FROM_POINTER(arg_index); + int shift = win->eventstate->shift; + int len = RNA_property_array_length(ptr, prop); if (!shift) { RNA_property_boolean_set_index(ptr, prop, index, TRUE); - for (i=0; i<len; i++) + for (i = 0; i < len; i++) if (i != index) RNA_property_boolean_set_index(ptr, prop, i, 0); RNA_property_update(C, ptr, prop); - for (cbut=but->block->buttons.first; cbut; cbut=cbut->next) + for (cbut = but->block->buttons.first; cbut; cbut = cbut->next) ui_check_but(cbut); } } @@ -344,7 +344,7 @@ static void ui_layer_but_cb(bContext *C, void *arg_but, void *arg_index) /* create buttons for an item with an RNA array */ static void ui_item_array(uiLayout *layout, uiBlock *block, const char *name, int icon, PointerRNA *ptr, PropertyRNA *prop, int len, int x, int y, int w, int UNUSED(h), int expand, int slider, int toggle, int icon_only) { - uiStyle *style= layout->root->style; + uiStyle *style = layout->root->style; uiBut *but; PropertyType type; PropertySubType subtype; @@ -352,10 +352,10 @@ static void ui_item_array(uiLayout *layout, uiBlock *block, const char *name, in int a, b; /* retrieve type and subtype */ - type= RNA_property_type(prop); - subtype= RNA_property_subtype(prop); + type = RNA_property_type(prop); + subtype = RNA_property_subtype(prop); - sub= ui_item_local_sublayout(layout, layout, 1); + sub = ui_item_local_sublayout(layout, layout, 1); uiBlockSetCurLayout(block, sub); /* create label */ @@ -366,68 +366,68 @@ static void ui_item_array(uiLayout *layout, uiBlock *block, const char *name, in if (type == PROP_BOOLEAN && ELEM(subtype, PROP_LAYER, PROP_LAYER_MEMBER)) { /* special check for layer layout */ int butw, buth, unit; - int cols= (len >= 20)? 2: 1; - int colbuts= len/(2*cols); - int layer_used= 0; + int cols = (len >= 20) ? 2 : 1; + int colbuts = len / (2 * cols); + int layer_used = 0; uiBlockSetCurLayout(block, uiLayoutAbsolute(layout, 0)); - unit= UI_UNIT_X*0.75; - butw= unit; - buth= unit; + unit = UI_UNIT_X * 0.75; + butw = unit; + buth = unit; if (ptr->type == &RNA_Armature) { - bArmature *arm= (bArmature *)ptr->data; - layer_used= arm->layer_used; + bArmature *arm = (bArmature *)ptr->data; + layer_used = arm->layer_used; } - for (b=0; b<cols; b++) { + for (b = 0; b < cols; b++) { uiBlockBeginAlign(block); - for (a=0; a<colbuts; a++) { - if (layer_used & (1<<(a+b*colbuts))) icon= ICON_LAYER_USED; - else icon= ICON_BLANK1; + for (a = 0; a < colbuts; a++) { + if (layer_used & (1 << (a + b * colbuts))) icon = ICON_LAYER_USED; + else icon = ICON_BLANK1; - but = uiDefAutoButR(block, ptr, prop, a+b*colbuts, "", icon, x + butw*a, y+buth, butw, buth); + but = uiDefAutoButR(block, ptr, prop, a + b * colbuts, "", icon, x + butw * a, y + buth, butw, buth); if (subtype == PROP_LAYER_MEMBER) - uiButSetFunc(but, ui_layer_but_cb, but, SET_INT_IN_POINTER(a+b*colbuts)); + uiButSetFunc(but, ui_layer_but_cb, but, SET_INT_IN_POINTER(a + b * colbuts)); } - for (a=0; a<colbuts; a++) { - if (layer_used & (1<<(a+len/2+b*colbuts))) icon= ICON_LAYER_USED; - else icon= ICON_BLANK1; + for (a = 0; a < colbuts; a++) { + if (layer_used & (1 << (a + len / 2 + b * colbuts))) icon = ICON_LAYER_USED; + else icon = ICON_BLANK1; - but = uiDefAutoButR(block, ptr, prop, a+len/2+b*colbuts, "", icon, x + butw*a, y, butw, buth); + but = uiDefAutoButR(block, ptr, prop, a + len / 2 + b * colbuts, "", icon, x + butw * a, y, butw, buth); if (subtype == PROP_LAYER_MEMBER) - uiButSetFunc(but, ui_layer_but_cb, but, SET_INT_IN_POINTER(a+len/2+b*colbuts)); + uiButSetFunc(but, ui_layer_but_cb, but, SET_INT_IN_POINTER(a + len / 2 + b * colbuts)); } uiBlockEndAlign(block); - x += colbuts*butw + style->buttonspacex; + x += colbuts * butw + style->buttonspacex; } } else if (subtype == PROP_MATRIX) { - int totdim, dim_size[3]; /* 3 == RNA_MAX_ARRAY_DIMENSION */ + int totdim, dim_size[3]; /* 3 == RNA_MAX_ARRAY_DIMENSION */ int row, col; uiBlockSetCurLayout(block, uiLayoutAbsolute(layout, 1)); - totdim= RNA_property_array_dimension(ptr, prop, dim_size); - if (totdim != 2) return; /* only 2D matrices supported in UI so far */ + totdim = RNA_property_array_dimension(ptr, prop, dim_size); + if (totdim != 2) return; /* only 2D matrices supported in UI so far */ w /= dim_size[0]; /* h /= dim_size[1]; */ /* UNUSED */ - for (a=0; a<len; a++) { - col= a % dim_size[0]; - row= a / dim_size[0]; - - but = uiDefAutoButR(block, ptr, prop, a, "", ICON_NONE, x + w*col, y+(dim_size[1]*UI_UNIT_Y)-(row*UI_UNIT_Y), w, UI_UNIT_Y); - if (slider && but->type==NUM) - but->type= NUMSLI; + for (a = 0; a < len; a++) { + col = a % dim_size[0]; + row = a / dim_size[0]; + + but = uiDefAutoButR(block, ptr, prop, a, "", ICON_NONE, x + w * col, y + (dim_size[1] * UI_UNIT_Y) - (row * UI_UNIT_Y), w, UI_UNIT_Y); + if (slider && but->type == NUM) + but->type = NUMSLI; } } else if (subtype == PROP_DIRECTION) { - uiDefButR_prop(block, BUT_NORMAL, 0, name, x, y, UI_UNIT_X*3, UI_UNIT_Y*3, ptr, prop, 0, 0, 0, -1, -1, NULL); + uiDefButR_prop(block, BUT_NORMAL, 0, name, x, y, UI_UNIT_X * 3, UI_UNIT_Y * 3, ptr, prop, 0, 0, 0, -1, -1, NULL); } else { /* note, this block of code is a bit arbitrary and has just been made @@ -438,33 +438,33 @@ static void ui_item_array(uiLayout *layout, uiBlock *block, const char *name, in uiDefAutoButR(block, ptr, prop, -1, "", ICON_NONE, 0, 0, w, UI_UNIT_Y); } else { - int *boolarr= NULL; + int *boolarr = NULL; /* even if 'expand' is fale, expanding anyway */ /* layout for known array subtypes */ - char str[3]= {'\0'}; + char str[3] = {'\0'}; if (!icon_only) { if (type != PROP_BOOLEAN) { - str[1]= ':'; + str[1] = ':'; } } /* show checkboxes for rna on a non-emboss block (menu for eg) */ if (type == PROP_BOOLEAN && ELEM(layout->root->block->dt, UI_EMBOSSN, UI_EMBOSSP)) { - boolarr= MEM_callocN(sizeof(int)*len, "ui_item_array"); + boolarr = MEM_callocN(sizeof(int) * len, "ui_item_array"); RNA_property_boolean_get_array(ptr, prop, boolarr); } - for (a=0; a<len; a++) { - if (!icon_only) str[0]= RNA_property_array_item_char(prop, a); - if (boolarr) icon= boolarr[a] ? ICON_CHECKBOX_HLT: ICON_CHECKBOX_DEHLT; + for (a = 0; a < len; a++) { + if (!icon_only) str[0] = RNA_property_array_item_char(prop, a); + if (boolarr) icon = boolarr[a] ? ICON_CHECKBOX_HLT : ICON_CHECKBOX_DEHLT; but = uiDefAutoButR(block, ptr, prop, a, str, icon, 0, 0, w, UI_UNIT_Y); - if (slider && but->type==NUM) - but->type= NUMSLI; - if (toggle && but->type==OPTION) - but->type= TOG; + if (slider && but->type == NUM) + but->type = NUMSLI; + if (toggle && but->type == OPTION) + but->type = TOG; } if (boolarr) { @@ -486,14 +486,14 @@ static void ui_item_enum_expand(uiLayout *layout, uiBlock *block, PointerRNA *pt RNA_property_enum_items_gettexted(block->evil_C, ptr, prop, &item, &totitem, &free); uiBlockSetCurLayout(block, ui_item_local_sublayout(layout, layout, 1)); - for (a=0; a<totitem; a++) { + for (a = 0; a < totitem; a++) { if (!item[a].identifier[0]) continue; - name= (!uiname || uiname[0])? item[a].name: ""; - icon= item[a].icon; - value= item[a].value; - itemw= ui_text_icon_width(block->curlayout, name, icon, 0); + name = (!uiname || uiname[0]) ? item[a].name : ""; + icon = item[a].icon; + value = item[a].value; + itemw = ui_text_icon_width(block->curlayout, name, icon, 0); if (icon && name[0] && !icon_only) but = uiDefIconTextButR_prop(block, ROW, 0, icon, name, 0, 0, itemw, h, ptr, prop, -1, 0, value, -1, -1, NULL); @@ -515,7 +515,7 @@ static void ui_item_enum_expand(uiLayout *layout, uiBlock *block, PointerRNA *pt /* callback for keymap item change button */ static void ui_keymap_but_cb(bContext *UNUSED(C), void *but_v, void *UNUSED(key_v)) { - uiBut *but= but_v; + uiBut *but = but_v; RNA_boolean_set(&but->rnapoin, "shift", (but->modifier_key & KM_SHIFT) != 0); RNA_boolean_set(&but->rnapoin, "ctrl", (but->modifier_key & KM_CTRL) != 0); @@ -527,37 +527,37 @@ static void ui_keymap_but_cb(bContext *UNUSED(C), void *but_v, void *UNUSED(key_ static uiBut *ui_item_with_label(uiLayout *layout, uiBlock *block, const char *name, int icon, PointerRNA *ptr, PropertyRNA *prop, int index, int x, int y, int w, int h, int flag) { uiLayout *sub; - uiBut *but=NULL; + uiBut *but = NULL; PropertyType type; PropertySubType subtype; int labelw; - sub= uiLayoutRow(layout, 0); + sub = uiLayoutRow(layout, 0); uiBlockSetCurLayout(block, sub); if (name[0]) { /* XXX UI_GetStringWidth is not accurate */ #if 0 labelw = UI_GetStringWidth(name); - CLAMP(labelw, w/4, 3*w/4); + CLAMP(labelw, w / 4, 3 * w / 4); #endif - labelw= w/3; + labelw = w / 3; uiDefBut(block, LABEL, 0, name, x, y, labelw, h, NULL, 0.0, 0.0, 0, 0, ""); - w= w-labelw; + w = w - labelw; } - type= RNA_property_type(prop); - subtype= RNA_property_subtype(prop); + type = RNA_property_type(prop); + subtype = RNA_property_subtype(prop); if (subtype == PROP_FILEPATH || subtype == PROP_DIRPATH) { uiBlockSetCurLayout(block, uiLayoutRow(sub, 1)); - uiDefAutoButR(block, ptr, prop, index, "", icon, x, y, w-UI_UNIT_X, h); + uiDefAutoButR(block, ptr, prop, index, "", icon, x, y, w - UI_UNIT_X, h); /* BUTTONS_OT_file_browse calls uiFileBrowseContextProperty */ - but = uiDefIconButO(block, BUT, subtype==PROP_DIRPATH ? - "BUTTONS_OT_directory_browse" : - "BUTTONS_OT_file_browse", - WM_OP_INVOKE_DEFAULT, ICON_FILESEL, x, y, UI_UNIT_X, h, NULL); + but = uiDefIconButO(block, BUT, subtype == PROP_DIRPATH ? + "BUTTONS_OT_directory_browse" : + "BUTTONS_OT_file_browse", + WM_OP_INVOKE_DEFAULT, ICON_FILESEL, x, y, UI_UNIT_X, h, NULL); } else if (flag & UI_ITEM_R_EVENT) { uiDefButR_prop(block, KEYEVT, 0, name, x, y, w, h, ptr, prop, index, 0, 0, -1, -1, NULL); @@ -575,7 +575,7 @@ static uiBut *ui_item_with_label(uiLayout *layout, uiBlock *block, const char *n } } else - but = uiDefAutoButR(block, ptr, prop, index, (type == PROP_ENUM && !(flag & UI_ITEM_R_ICON_ONLY))? NULL: "", icon, x, y, w, h); + but = uiDefAutoButR(block, ptr, prop, index, (type == PROP_ENUM && !(flag & UI_ITEM_R_ICON_ONLY)) ? NULL : "", icon, x, y, w, h); uiBlockSetCurLayout(block, layout); return but; @@ -583,25 +583,25 @@ static uiBut *ui_item_with_label(uiLayout *layout, uiBlock *block, const char *n void uiFileBrowseContextProperty(const bContext *C, PointerRNA *ptr, PropertyRNA **prop) { - ARegion *ar= CTX_wm_region(C); + ARegion *ar = CTX_wm_region(C); uiBlock *block; uiBut *but, *prevbut; memset(ptr, 0, sizeof(*ptr)); - *prop= NULL; + *prop = NULL; if (!ar) return; - for (block=ar->uiblocks.first; block; block=block->next) { - for (but=block->buttons.first; but; but= but->next) { - prevbut= but->prev; + for (block = ar->uiblocks.first; block; block = block->next) { + for (but = block->buttons.first; but; but = but->next) { + prevbut = but->prev; /* find the button before the active one */ if ((but->flag & UI_BUT_LAST_ACTIVE) && prevbut && prevbut->rnapoin.data) { if (RNA_property_type(prevbut->rnaprop) == PROP_STRING) { - *ptr= prevbut->rnapoin; - *prop= prevbut->rnaprop; + *ptr = prevbut->rnapoin; + *prop = prevbut->rnaprop; return; } } @@ -614,16 +614,16 @@ void uiFileBrowseContextProperty(const bContext *C, PointerRNA *ptr, PropertyRNA /* disabled item */ static void ui_item_disabled(uiLayout *layout, const char *name) { - uiBlock *block= layout->root->block; + uiBlock *block = layout->root->block; uiBut *but; int w; uiBlockSetCurLayout(block, layout); if (!name) - name= ""; + name = ""; - w= ui_text_icon_width(layout, name, 0, 0); + w = ui_text_icon_width(layout, name, 0, 0); but = uiDefBut(block, LABEL, 0, name, 0, 0, w, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, ""); but->flag |= UI_BUT_DISABLED; @@ -634,7 +634,7 @@ static void ui_item_disabled(uiLayout *layout, const char *name) /* operator items */ PointerRNA uiItemFullO_ptr(uiLayout *layout, wmOperatorType *ot, const char *name, int icon, IDProperty *properties, int context, int flag) { - uiBlock *block= layout->root->block; + uiBlock *block = layout->root->block; uiBut *but; int w; @@ -646,12 +646,12 @@ PointerRNA uiItemFullO_ptr(uiLayout *layout, wmOperatorType *ot, const char *nam } if (layout->root->type == UI_LAYOUT_MENU && !icon) - icon= ICON_BLANK1; + icon = ICON_BLANK1; /* create button */ uiBlockSetCurLayout(block, layout); - w= ui_text_icon_width(layout, name, icon, 0); + w = ui_text_icon_width(layout, name, icon, 0); if (flag & UI_ITEM_R_NO_BG) uiBlockSetEmboss(block, UI_EMBOSSN); @@ -683,14 +683,14 @@ PointerRNA uiItemFullO_ptr(uiLayout *layout, wmOperatorType *ot, const char *nam /* assign properties */ if (properties || (flag & UI_ITEM_O_RETURN_PROPS)) { - PointerRNA *opptr= uiButGetOperatorPtrRNA(but); + PointerRNA *opptr = uiButGetOperatorPtrRNA(but); if (properties) { - opptr->data= properties; + opptr->data = properties; } else { IDPropertyTemplate val = {0}; - opptr->data= IDP_New(IDP_GROUP, &val, "wmOperatorProperties"); + opptr->data = IDP_New(IDP_GROUP, &val, "wmOperatorProperties"); } return *opptr; @@ -781,7 +781,7 @@ void uiItemsFullEnumO(uiLayout *layout, const char *opname, const char *propname PointerRNA ptr; PropertyRNA *prop; uiBut *bt; - uiBlock *block= layout->root->block; + uiBlock *block = layout->root->block; if (!ot || !ot->srna) { ui_item_disabled(layout, opname); @@ -798,12 +798,12 @@ void uiItemsFullEnumO(uiLayout *layout, const char *opname, const char *propname if (prop && RNA_property_type(prop) == PROP_ENUM) { EnumPropertyItem *item; int totitem, i, free; - uiLayout *split= uiLayoutSplit(layout, 0, 0); - uiLayout *column= uiLayoutColumn(split, 0); + uiLayout *split = uiLayoutSplit(layout, 0, 0); + uiLayout *column = uiLayoutColumn(split, 0); RNA_property_enum_items_gettexted(block->evil_C, &ptr, prop, &item, &totitem, &free); - for (i=0; i<totitem; i++) { + for (i = 0; i < totitem; i++) { if (item[i].identifier[0]) { if (properties) { PointerRNA tptr; @@ -813,7 +813,7 @@ void uiItemsFullEnumO(uiLayout *layout, const char *opname, const char *propname IDP_FreeProperty(tptr.data); MEM_freeN(tptr.data); } - tptr.data= IDP_CopyProperty(properties); + tptr.data = IDP_CopyProperty(properties); RNA_property_enum_set(&tptr, prop, item[i].value); uiItemFullO_ptr(column, ot, item[i].name, item[i].icon, tptr.data, context, flag); @@ -825,14 +825,14 @@ void uiItemsFullEnumO(uiLayout *layout, const char *opname, const char *propname else { if (item[i].name) { if (i != 0) { - column= uiLayoutColumn(split, 0); + column = uiLayoutColumn(split, 0); /* inconsistent, but menus with labels do not look good flipped */ block->flag |= UI_BLOCK_NO_FLIP; } uiItemL(column, item[i].name, ICON_NONE); - bt= block->buttons.last; - bt->flag= UI_TEXT_LEFT; + bt = block->buttons.last; + bt->flag = UI_TEXT_LEFT; } else /* XXX bug here, collums draw bottom item badly */ uiItemS(column); @@ -857,7 +857,7 @@ void uiItemEnumO_value(uiLayout *layout, const char *name, int icon, const char PointerRNA ptr; PropertyRNA *prop; - UI_OPERATOR_ERROR_RET(ot, opname, return); + UI_OPERATOR_ERROR_RET(ot, opname, return ); WM_operator_properties_create_ptr(&ptr, ot); @@ -888,14 +888,14 @@ void uiItemEnumO_string(uiLayout *layout, const char *name, int icon, const char EnumPropertyItem *item; int value, free; - UI_OPERATOR_ERROR_RET(ot, opname, return); + UI_OPERATOR_ERROR_RET(ot, opname, return ); WM_operator_properties_create_ptr(&ptr, ot); /* enum lookup */ - if ((prop= RNA_struct_find_property(&ptr, propname))) { + if ((prop = RNA_struct_find_property(&ptr, propname))) { RNA_property_enum_items_gettexted(layout->root->block->evil_C, &ptr, prop, &item, NULL, &free); - if (item==NULL || RNA_enum_value_from_id(item, value_str, &value)==0) { + if (item == NULL || RNA_enum_value_from_id(item, value_str, &value) == 0) { if (free) { MEM_freeN(item); } @@ -926,7 +926,7 @@ void uiItemBooleanO(uiLayout *layout, const char *name, int icon, const char *op wmOperatorType *ot = WM_operatortype_find(opname, 0); /* print error next */ PointerRNA ptr; - UI_OPERATOR_ERROR_RET(ot, opname, return); + UI_OPERATOR_ERROR_RET(ot, opname, return ); WM_operator_properties_create_ptr(&ptr, ot); RNA_boolean_set(&ptr, propname, value); @@ -939,7 +939,7 @@ void uiItemIntO(uiLayout *layout, const char *name, int icon, const char *opname wmOperatorType *ot = WM_operatortype_find(opname, 0); /* print error next */ PointerRNA ptr; - UI_OPERATOR_ERROR_RET(ot, opname, return); + UI_OPERATOR_ERROR_RET(ot, opname, return ); WM_operator_properties_create_ptr(&ptr, ot); RNA_int_set(&ptr, propname, value); @@ -952,7 +952,7 @@ void uiItemFloatO(uiLayout *layout, const char *name, int icon, const char *opna wmOperatorType *ot = WM_operatortype_find(opname, 0); /* print error next */ PointerRNA ptr; - UI_OPERATOR_ERROR_RET(ot, opname, return); + UI_OPERATOR_ERROR_RET(ot, opname, return ); WM_operator_properties_create_ptr(&ptr, ot); RNA_float_set(&ptr, propname, value); @@ -965,7 +965,7 @@ void uiItemStringO(uiLayout *layout, const char *name, int icon, const char *opn wmOperatorType *ot = WM_operatortype_find(opname, 0); /* print error next */ PointerRNA ptr; - UI_OPERATOR_ERROR_RET(ot, opname, return); + UI_OPERATOR_ERROR_RET(ot, opname, return ); WM_operator_properties_create_ptr(&ptr, ot); RNA_string_set(&ptr, propname, value); @@ -987,46 +987,46 @@ static void ui_item_rna_size(uiLayout *layout, const char *name, int icon, Point int len, w, h; /* arbitrary extended width by type */ - type= RNA_property_type(prop); - subtype= RNA_property_subtype(prop); - len= RNA_property_array_length(ptr, prop); + type = RNA_property_type(prop); + subtype = RNA_property_subtype(prop); + len = RNA_property_array_length(ptr, prop); if (ELEM3(type, PROP_STRING, PROP_POINTER, PROP_ENUM) && !name[0] && !icon_only) - name= "non-empty text"; + name = "non-empty text"; else if (type == PROP_BOOLEAN && !name[0] && !icon_only) - icon= ICON_DOT; + icon = ICON_DOT; - w= ui_text_icon_width(layout, name, icon, 0); - h= UI_UNIT_Y; + w = ui_text_icon_width(layout, name, icon, 0); + h = UI_UNIT_Y; /* increase height for arrays */ if (index == RNA_NO_INDEX && len > 0) { if (!name[0] && icon == ICON_NONE) - h= 0; + h = 0; if (ELEM(subtype, PROP_LAYER, PROP_LAYER_MEMBER)) - h += 2*UI_UNIT_Y; + h += 2 * UI_UNIT_Y; else if (subtype == PROP_MATRIX) - h += ceil(sqrt(len))*UI_UNIT_Y; + h += ceil(sqrt(len)) * UI_UNIT_Y; else - h += len*UI_UNIT_Y; + h += len * UI_UNIT_Y; } else if (ui_layout_vary_direction(layout) == UI_ITEM_VARY_X) { if (type == PROP_BOOLEAN && name[0]) - w += UI_UNIT_X/5; + w += UI_UNIT_X / 5; else if (type == PROP_ENUM) - w += UI_UNIT_X/4; + w += UI_UNIT_X / 4; else if (type == PROP_FLOAT || type == PROP_INT) - w += UI_UNIT_X*3; + w += UI_UNIT_X * 3; } - *r_w= w; - *r_h= h; + *r_w = w; + *r_h = h; } void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index, int value, int flag, const char *name, int icon) { - uiBlock *block= layout->root->block; + uiBlock *block = layout->root->block; uiBut *but; PropertyType type; char namestr[UI_MAX_NAME_STR]; @@ -1035,44 +1035,44 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index uiBlockSetCurLayout(block, layout); /* retrieve info */ - type= RNA_property_type(prop); - is_array= RNA_property_array_check(prop); - len= (is_array) ? RNA_property_array_length(ptr, prop) : 0; + type = RNA_property_type(prop); + is_array = RNA_property_array_check(prop); + len = (is_array) ? RNA_property_array_length(ptr, prop) : 0; /* set name and icon */ if (!name) - name= RNA_property_ui_name(prop); + name = RNA_property_ui_name(prop); if (icon == ICON_NONE) - icon= RNA_property_ui_icon(prop); + icon = RNA_property_ui_icon(prop); if (ELEM4(type, PROP_INT, PROP_FLOAT, PROP_STRING, PROP_POINTER)) - name= ui_item_name_add_colon(name, namestr); + name = ui_item_name_add_colon(name, namestr); else if (type == PROP_BOOLEAN && is_array && index == RNA_NO_INDEX) - name= ui_item_name_add_colon(name, namestr); + name = ui_item_name_add_colon(name, namestr); else if (type == PROP_ENUM && index != RNA_ENUM_VALUE) - name= ui_item_name_add_colon(name, namestr); + name = ui_item_name_add_colon(name, namestr); if (layout->root->type == UI_LAYOUT_MENU) { if (type == PROP_BOOLEAN && ((is_array == FALSE) || (index != RNA_NO_INDEX))) { - if (is_array) icon= (RNA_property_boolean_get_index(ptr, prop, index)) ? ICON_CHECKBOX_HLT: ICON_CHECKBOX_DEHLT; - else icon= (RNA_property_boolean_get(ptr, prop)) ? ICON_CHECKBOX_HLT: ICON_CHECKBOX_DEHLT; + if (is_array) icon = (RNA_property_boolean_get_index(ptr, prop, index)) ? ICON_CHECKBOX_HLT : ICON_CHECKBOX_DEHLT; + else icon = (RNA_property_boolean_get(ptr, prop)) ? ICON_CHECKBOX_HLT : ICON_CHECKBOX_DEHLT; } else if (type == PROP_ENUM && index == RNA_ENUM_VALUE) { - int enum_value= RNA_property_enum_get(ptr, prop); + int enum_value = RNA_property_enum_get(ptr, prop); if (RNA_property_flag(prop) & PROP_ENUM_FLAG) { - icon= (enum_value & value)? ICON_CHECKBOX_HLT: ICON_CHECKBOX_DEHLT; + icon = (enum_value & value) ? ICON_CHECKBOX_HLT : ICON_CHECKBOX_DEHLT; } else { - icon= (enum_value == value)? ICON_CHECKBOX_HLT: ICON_CHECKBOX_DEHLT; + icon = (enum_value == value) ? ICON_CHECKBOX_HLT : ICON_CHECKBOX_DEHLT; } } } - slider= (flag & UI_ITEM_R_SLIDER); - toggle= (flag & UI_ITEM_R_TOGGLE); - expand= (flag & UI_ITEM_R_EXPAND); - icon_only= (flag & UI_ITEM_R_ICON_ONLY); - no_bg= (flag & UI_ITEM_R_NO_BG); + slider = (flag & UI_ITEM_R_SLIDER); + toggle = (flag & UI_ITEM_R_TOGGLE); + expand = (flag & UI_ITEM_R_EXPAND); + icon_only = (flag & UI_ITEM_R_ICON_ONLY); + no_bg = (flag & UI_ITEM_R_NO_BG); /* get size */ ui_item_rna_size(layout, name, icon, ptr, prop, index, icon_only, &w, &h); @@ -1097,7 +1097,7 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index ui_item_enum_expand(layout, block, ptr, prop, name, h, icon_only); /* property with separate label */ else if (type == PROP_ENUM || type == PROP_STRING || type == PROP_POINTER) { - but= ui_item_with_label(layout, block, name, icon, ptr, prop, index, 0, 0, w, h, flag); + but = ui_item_with_label(layout, block, name, icon, ptr, prop, index, 0, 0, w, h, flag); ui_but_add_search(but, ptr, prop, NULL, NULL); if (layout->redalert) @@ -1107,11 +1107,11 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index else { but = uiDefAutoButR(block, ptr, prop, index, name, icon, 0, 0, w, h); - if (slider && but->type==NUM) - but->type= NUMSLI; + if (slider && but->type == NUM) + but->type = NUMSLI; - if (toggle && but->type==OPTION) - but->type= TOG; + if (toggle && but->type == OPTION) + but->type = TOG; if (layout->redalert) uiButSetFlag(but, UI_BUT_REDALERT); @@ -1123,7 +1123,7 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index void uiItemR(uiLayout *layout, PointerRNA *ptr, const char *propname, int flag, const char *name, int icon) { - PropertyRNA *prop= RNA_struct_find_property(ptr, propname); + PropertyRNA *prop = RNA_struct_find_property(ptr, propname); if (!prop) { ui_item_disabled(layout, propname); @@ -1136,7 +1136,7 @@ void uiItemR(uiLayout *layout, PointerRNA *ptr, const char *propname, int flag, void uiItemEnumR(uiLayout *layout, const char *name, int icon, struct PointerRNA *ptr, const char *propname, int value) { - PropertyRNA *prop= RNA_struct_find_property(ptr, propname); + PropertyRNA *prop = RNA_struct_find_property(ptr, propname); if (!prop || RNA_property_type(prop) != PROP_ENUM) { ui_item_disabled(layout, propname); @@ -1149,7 +1149,7 @@ void uiItemEnumR(uiLayout *layout, const char *name, int icon, struct PointerRNA void uiItemEnumR_string(uiLayout *layout, struct PointerRNA *ptr, const char *propname, const char *value, const char *name, int icon) { - PropertyRNA *prop= RNA_struct_find_property(ptr, propname); + PropertyRNA *prop = RNA_struct_find_property(ptr, propname); EnumPropertyItem *item; int ivalue, a, free; @@ -1170,7 +1170,7 @@ void uiItemEnumR_string(uiLayout *layout, struct PointerRNA *ptr, const char *pr return; } - for (a=0; item[a].identifier; a++) { + for (a = 0; item[a].identifier; a++) { if (item[a].value == ivalue) { uiItemFullR(layout, ptr, prop, RNA_ENUM_VALUE, ivalue, 0, name ? name : item[a].name, icon ? icon : item[a].icon); break; @@ -1185,10 +1185,10 @@ void uiItemEnumR_string(uiLayout *layout, struct PointerRNA *ptr, const char *pr void uiItemsEnumR(uiLayout *layout, struct PointerRNA *ptr, const char *propname) { PropertyRNA *prop; - uiBlock *block= layout->root->block; + uiBlock *block = layout->root->block; uiBut *bt; - prop= RNA_struct_find_property(ptr, propname); + prop = RNA_struct_find_property(ptr, propname); if (!prop) { ui_item_disabled(layout, propname); @@ -1203,26 +1203,26 @@ void uiItemsEnumR(uiLayout *layout, struct PointerRNA *ptr, const char *propname else { EnumPropertyItem *item; int totitem, i, free; - uiLayout *split= uiLayoutSplit(layout, 0, 0); - uiLayout *column= uiLayoutColumn(split, 0); + uiLayout *split = uiLayoutSplit(layout, 0, 0); + uiLayout *column = uiLayoutColumn(split, 0); RNA_property_enum_items_gettexted(block->evil_C, ptr, prop, &item, &totitem, &free); - for (i=0; i<totitem; i++) { + for (i = 0; i < totitem; i++) { if (item[i].identifier[0]) { uiItemEnumR(column, item[i].name, ICON_NONE, ptr, propname, item[i].value); } else { if (item[i].name) { if (i != 0) { - column= uiLayoutColumn(split, 0); + column = uiLayoutColumn(split, 0); /* inconsistent, but menus with labels do not look good flipped */ block->flag |= UI_BLOCK_NO_FLIP; } uiItemL(column, item[i].name, ICON_NONE); - bt= block->buttons.last; - bt->flag= UI_TEXT_LEFT; + bt = block->buttons.last; + bt->flag = UI_TEXT_LEFT; } else uiItemS(column); @@ -1249,7 +1249,7 @@ static int sort_search_items_list(void *a, void *b) CollItemSearch *cis1 = (CollItemSearch *)a; CollItemSearch *cis2 = (CollItemSearch *)b; - if (BLI_strcasecmp(cis1->name, cis2->name)>0) + if (BLI_strcasecmp(cis1->name, cis2->name) > 0) return 1; else return 0; @@ -1257,12 +1257,12 @@ static int sort_search_items_list(void *a, void *b) static void rna_search_cb(const struct bContext *C, void *arg_but, const char *str, uiSearchItems *items) { - uiBut *but= arg_but; + uiBut *but = arg_but; char *name; - int i=0, iconid=0, flag= RNA_property_flag(but->rnaprop); - ListBase *items_list= MEM_callocN(sizeof(ListBase), "items_list"); + int i = 0, iconid = 0, flag = RNA_property_flag(but->rnaprop); + ListBase *items_list = MEM_callocN(sizeof(ListBase), "items_list"); CollItemSearch *cis; - const int skip_filter= !but->changed; + const int skip_filter = !but->changed; /* build a temporary list of relevant items first */ RNA_PROP_BEGIN(&but->rnasearchpoin, itemptr, but->rnasearchprop) { @@ -1271,25 +1271,25 @@ static void rna_search_cb(const struct bContext *C, void *arg_but, const char *s continue; /* use filter */ - if (RNA_property_type(but->rnaprop)==PROP_POINTER) { - if (RNA_property_pointer_poll(&but->rnapoin, but->rnaprop, &itemptr)==0) + if (RNA_property_type(but->rnaprop) == PROP_POINTER) { + if (RNA_property_pointer_poll(&but->rnapoin, but->rnaprop, &itemptr) == 0) continue; } if (itemptr.type && RNA_struct_is_ID(itemptr.type)) { - ID *id= itemptr.data; + ID *id = itemptr.data; char name_ui[MAX_ID_NAME]; -#if 0 /* this name is used for a string comparison and can't be modified, TODO */ +#if 0 /* this name is used for a string comparison and can't be modified, TODO */ name_uiprefix_id(name_ui, id); #else - BLI_strncpy(name_ui, id->name+2, sizeof(name_ui)); + BLI_strncpy(name_ui, id->name + 2, sizeof(name_ui)); #endif - name= BLI_strdup(name_ui); - iconid= ui_id_icon_get((bContext*)C, id, 0); + name = BLI_strdup(name_ui); + iconid = ui_id_icon_get((bContext *)C, id, 0); } else { - name= RNA_struct_name_get_alloc(&itemptr, NULL, 0, NULL); /* could use the string length here */ + name = RNA_struct_name_get_alloc(&itemptr, NULL, 0, NULL); /* could use the string length here */ iconid = 0; } @@ -1311,13 +1311,13 @@ static void rna_search_cb(const struct bContext *C, void *arg_but, const char *s BLI_sortlist(items_list, sort_search_items_list); /* add search items from temporary list */ - for (cis=items_list->first; cis; cis=cis->next) { + for (cis = items_list->first; cis; cis = cis->next) { if (!uiSearchItemAdd(items, cis->name, SET_INT_IN_POINTER(cis->index), cis->iconid)) { break; } } - for (cis=items_list->first; cis; cis=cis->next) { + for (cis = items_list->first; cis; cis = cis->next) { MEM_freeN(cis->name); } BLI_freelistN(items_list); @@ -1331,15 +1331,15 @@ static void search_id_collection(StructRNA *ptype, PointerRNA *ptr, PropertyRNA /* look for collection property in Main */ RNA_main_pointer_create(G.main, ptr); - *prop= NULL; + *prop = NULL; RNA_STRUCT_BEGIN(ptr, iprop) { /* if it's a collection and has same pointer type, we've got it */ if (RNA_property_type(iprop) == PROP_COLLECTION) { - srna= RNA_property_pointer_type(ptr, iprop); + srna = RNA_property_pointer_type(ptr, iprop); if (ptype == srna) { - *prop= iprop; + *prop = iprop; break; } } @@ -1355,19 +1355,19 @@ void ui_but_add_search(uiBut *but, PointerRNA *ptr, PropertyRNA *prop, PointerRN /* for ID's we do automatic lookup */ if (!searchprop) { if (RNA_property_type(prop) == PROP_POINTER) { - ptype= RNA_property_pointer_type(ptr, prop); + ptype = RNA_property_pointer_type(ptr, prop); search_id_collection(ptype, &sptr, &searchprop); - searchptr= &sptr; + searchptr = &sptr; } } /* turn button into search button */ if (searchprop) { - but->type= SEARCH_MENU; - but->hardmax= MAX2(but->hardmax, 256); - but->rnasearchpoin= *searchptr; - but->rnasearchprop= searchprop; - but->flag |= UI_ICON_LEFT|UI_TEXT_LEFT; + but->type = SEARCH_MENU; + but->hardmax = MAX2(but->hardmax, 256); + but->rnasearchpoin = *searchptr; + but->rnasearchprop = searchprop; + but->flag |= UI_ICON_LEFT | UI_TEXT_LEFT; uiButSetSearchFunc(but, rna_search_cb, but, NULL, NULL); } @@ -1383,20 +1383,20 @@ void uiItemPointerR(uiLayout *layout, struct PointerRNA *ptr, const char *propna int w, h; /* validate arguments */ - prop= RNA_struct_find_property(ptr, propname); + prop = RNA_struct_find_property(ptr, propname); if (!prop) { RNA_warning("property not found: %s.%s", RNA_struct_identifier(ptr->type), propname); return; } - type= RNA_property_type(prop); + type = RNA_property_type(prop); if (!ELEM(type, PROP_POINTER, PROP_STRING)) { RNA_warning("Property %s must be a pointer or string", propname); return; } - searchprop= RNA_struct_find_property(searchptr, searchpropname); + searchprop = RNA_struct_find_property(searchptr, searchpropname); if (!searchprop) { @@ -1409,22 +1409,22 @@ void uiItemPointerR(uiLayout *layout, struct PointerRNA *ptr, const char *propna } /* get icon & name */ - if (icon==ICON_NONE) { + if (icon == ICON_NONE) { if (type == PROP_POINTER) - icontype= RNA_property_pointer_type(ptr, prop); + icontype = RNA_property_pointer_type(ptr, prop); else - icontype= RNA_property_pointer_type(searchptr, searchprop); + icontype = RNA_property_pointer_type(searchptr, searchprop); - icon= RNA_struct_ui_icon(icontype); + icon = RNA_struct_ui_icon(icontype); } if (!name) - name= RNA_property_ui_name(prop); + name = RNA_property_ui_name(prop); /* create button */ - block= uiLayoutGetBlock(layout); + block = uiLayoutGetBlock(layout); ui_item_rna_size(layout, name, icon, ptr, prop, 0, 0, &w, &h); - but= ui_item_with_label(layout, block, name, icon, ptr, prop, 0, 0, 0, w, h, 0); + but = ui_item_with_label(layout, block, name, icon, ptr, prop, 0, 0, 0, w, h, 0); ui_but_add_search(but, ptr, prop, searchptr, searchprop); } @@ -1432,17 +1432,17 @@ void uiItemPointerR(uiLayout *layout, struct PointerRNA *ptr, const char *propna /* menu item */ static void ui_item_menutype_func(bContext *C, uiLayout *layout, void *arg_mt) { - MenuType *mt= (MenuType*)arg_mt; + MenuType *mt = (MenuType *)arg_mt; Menu menu = {NULL}; - menu.type= mt; - menu.layout= layout; + menu.type = mt; + menu.layout = layout; mt->draw(C, &menu); } static void ui_item_menu(uiLayout *layout, const char *name, int icon, uiMenuCreateFunc func, void *arg, void *argN, const char *tip) { - uiBlock *block= layout->root->block; + uiBlock *block = layout->root->block; uiBut *but; int w, h; @@ -1452,12 +1452,12 @@ static void ui_item_menu(uiLayout *layout, const char *name, int icon, uiMenuCre uiBlockSetEmboss(block, UI_EMBOSS); if (!name) - name= ""; + name = ""; if (layout->root->type == UI_LAYOUT_MENU && !icon) - icon= ICON_BLANK1; + icon = ICON_BLANK1; - w= ui_text_icon_width(layout, name, icon, 1); - h= UI_UNIT_Y; + w = ui_text_icon_width(layout, name, icon, 1); + h = UI_UNIT_Y; if (layout->root->type == UI_LAYOUT_HEADER) /* ugly .. */ w -= 10; @@ -1470,14 +1470,14 @@ static void ui_item_menu(uiLayout *layout, const char *name, int icon, uiMenuCre but = uiDefMenuBut(block, func, arg, name, 0, 0, w, h, tip); if (argN) { /* ugly .. */ - but->poin= (char*)but; - but->func_argN= argN; + but->poin = (char *)but; + but->func_argN = argN; } if (layout->root->type == UI_LAYOUT_HEADER) uiBlockSetEmboss(block, UI_EMBOSS); else if (ELEM(layout->root->type, UI_LAYOUT_PANEL, UI_LAYOUT_TOOLBAR)) { - but->type= MENU; + but->type = MENU; but->flag |= UI_TEXT_LEFT; } } @@ -1488,7 +1488,7 @@ void uiItemM(uiLayout *layout, bContext *UNUSED(C), const char *menuname, const mt = WM_menutype_find(menuname, FALSE); - if (mt==NULL) { + if (mt == NULL) { RNA_warning("not found %s", menuname); return; } @@ -1498,7 +1498,7 @@ void uiItemM(uiLayout *layout, bContext *UNUSED(C), const char *menuname, const } if (layout->root->type == UI_LAYOUT_MENU && !icon) - icon= ICON_BLANK1; + icon = ICON_BLANK1; ui_item_menu(layout, name, icon, ui_item_menutype_func, mt, NULL, mt->description); } @@ -1506,18 +1506,18 @@ void uiItemM(uiLayout *layout, bContext *UNUSED(C), const char *menuname, const /* label item */ static uiBut *uiItemL_(uiLayout *layout, const char *name, int icon) { - uiBlock *block= layout->root->block; + uiBlock *block = layout->root->block; uiBut *but; int w; uiBlockSetCurLayout(block, layout); if (!name) - name= ""; + name = ""; if (layout->root->type == UI_LAYOUT_MENU && !icon) - icon= ICON_BLANK1; + icon = ICON_BLANK1; - w= ui_text_icon_width(layout, name, icon, 0); + w = ui_text_icon_width(layout, name, icon, 0); if (icon && name[0]) but = uiDefIconTextBut(block, LABEL, 0, icon, name, 0, 0, w, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, ""); @@ -1536,7 +1536,7 @@ void uiItemL(uiLayout *layout, const char *name, int icon) void uiItemLDrag(uiLayout *layout, PointerRNA *ptr, const char *name, int icon) { - uiBut *but= uiItemL_(layout, name, icon); + uiBut *but = uiItemL_(layout, name, icon); if (ptr && ptr->type) if (RNA_struct_is_ID(ptr->type)) @@ -1548,18 +1548,18 @@ void uiItemLDrag(uiLayout *layout, PointerRNA *ptr, const char *name, int icon) void uiItemV(uiLayout *layout, const char *name, int icon, int argval) { /* label */ - uiBlock *block= layout->root->block; - float *retvalue= (block->handle)? &block->handle->retvalue: NULL; + uiBlock *block = layout->root->block; + float *retvalue = (block->handle) ? &block->handle->retvalue : NULL; int w; uiBlockSetCurLayout(block, layout); if (!name) - name= ""; + name = ""; if (layout->root->type == UI_LAYOUT_MENU && !icon) - icon= ICON_BLANK1; + icon = ICON_BLANK1; - w= ui_text_icon_width(layout, name, icon, 0); + w = ui_text_icon_width(layout, name, icon, 0); if (icon && name[0]) uiDefIconTextButF(block, BUT, argval, icon, name, 0, 0, w, UI_UNIT_Y, retvalue, 0.0, 0.0, 0, 0, ""); @@ -1572,7 +1572,7 @@ void uiItemV(uiLayout *layout, const char *name, int icon, int argval) /* separator item */ void uiItemS(uiLayout *layout) { - uiBlock *block= layout->root->block; + uiBlock *block = layout->root->block; uiBlockSetCurLayout(block, layout); uiDefBut(block, SEPR, 0, "", 0, 0, EM_SEPR_X, EM_SEPR_Y, NULL, 0.0, 0.0, 0, 0, ""); @@ -1598,7 +1598,7 @@ typedef struct MenuItemLevel { static void menu_item_enum_opname_menu(bContext *UNUSED(C), uiLayout *layout, void *arg) { - MenuItemLevel *lvl= (MenuItemLevel*)(((uiBut*)arg)->func_argN); + MenuItemLevel *lvl = (MenuItemLevel *)(((uiBut *)arg)->func_argN); uiLayoutSetOperatorContext(layout, lvl->opcontext); uiItemsEnumO(layout, lvl->opname, lvl->propname); @@ -1609,7 +1609,7 @@ void uiItemMenuEnumO(uiLayout *layout, const char *opname, const char *propname, wmOperatorType *ot = WM_operatortype_find(opname, 0); /* print error next */ MenuItemLevel *lvl; - UI_OPERATOR_ERROR_RET(ot, opname, return); + UI_OPERATOR_ERROR_RET(ot, opname, return ); if (!ot->srna) { ui_item_disabled(layout, opname); @@ -1618,21 +1618,21 @@ void uiItemMenuEnumO(uiLayout *layout, const char *opname, const char *propname, } if (!name) - name= ot->name; + name = ot->name; if (layout->root->type == UI_LAYOUT_MENU && !icon) - icon= ICON_BLANK1; + icon = ICON_BLANK1; - lvl= MEM_callocN(sizeof(MenuItemLevel), "MenuItemLevel"); + lvl = MEM_callocN(sizeof(MenuItemLevel), "MenuItemLevel"); BLI_strncpy(lvl->opname, opname, sizeof(lvl->opname)); BLI_strncpy(lvl->propname, propname, sizeof(lvl->propname)); - lvl->opcontext= layout->root->opcontext; + lvl->opcontext = layout->root->opcontext; ui_item_menu(layout, name, icon, menu_item_enum_opname_menu, NULL, lvl, ot->description); } static void menu_item_enum_rna_menu(bContext *UNUSED(C), uiLayout *layout, void *arg) { - MenuItemLevel *lvl= (MenuItemLevel*)(((uiBut*)arg)->func_argN); + MenuItemLevel *lvl = (MenuItemLevel *)(((uiBut *)arg)->func_argN); uiLayoutSetOperatorContext(layout, lvl->opcontext); uiItemsEnumR(layout, &lvl->rnapoin, lvl->propname); @@ -1643,7 +1643,7 @@ void uiItemMenuEnumR(uiLayout *layout, struct PointerRNA *ptr, const char *propn MenuItemLevel *lvl; PropertyRNA *prop; - prop= RNA_struct_find_property(ptr, propname); + prop = RNA_struct_find_property(ptr, propname); if (!prop) { ui_item_disabled(layout, propname); RNA_warning("property not found: %s.%s", RNA_struct_identifier(ptr->type), propname); @@ -1651,14 +1651,14 @@ void uiItemMenuEnumR(uiLayout *layout, struct PointerRNA *ptr, const char *propn } if (!name) - name= RNA_property_ui_name(prop); + name = RNA_property_ui_name(prop); if (layout->root->type == UI_LAYOUT_MENU && !icon) - icon= ICON_BLANK1; + icon = ICON_BLANK1; - lvl= MEM_callocN(sizeof(MenuItemLevel), "MenuItemLevel"); - lvl->rnapoin= *ptr; + lvl = MEM_callocN(sizeof(MenuItemLevel), "MenuItemLevel"); + lvl->rnapoin = *ptr; BLI_strncpy(lvl->propname, propname, sizeof(lvl->propname)); - lvl->opcontext= layout->root->opcontext; + lvl->opcontext = layout->root->opcontext; ui_item_menu(layout, name, icon, menu_item_enum_rna_menu, NULL, lvl, RNA_property_description(prop)); } @@ -1671,14 +1671,14 @@ static void ui_litem_estimate_row(uiLayout *litem) uiItem *item; int itemw, itemh; - litem->w= 0; - litem->h= 0; + litem->w = 0; + litem->h = 0; - for (item=litem->items.first; item; item=item->next) { + for (item = litem->items.first; item; item = item->next) { ui_item_size(item, &itemw, &itemh); litem->w += itemw; - litem->h= MAX2(itemh, litem->h); + litem->h = MAX2(itemh, litem->h); if (item->next) litem->w += litem->space; @@ -1687,22 +1687,22 @@ static void ui_litem_estimate_row(uiLayout *litem) static int ui_litem_min_width(int itemw) { - return MIN2(2*UI_UNIT_X, itemw); + return MIN2(2 * UI_UNIT_X, itemw); } static void ui_litem_layout_row(uiLayout *litem) { uiItem *item; int x, y, w, tot, totw, neww, itemw, minw, itemh, offset; - int fixedw, freew, fixedx, freex, flag= 0, lastw= 0; + int fixedw, freew, fixedx, freex, flag = 0, lastw = 0; /* x= litem->x; */ /* UNUSED */ - y= litem->y; - w= litem->w; - totw= 0; - tot= 0; + y = litem->y; + w = litem->w; + totw = 0; + tot = 0; - for (item=litem->items.first; item; item=item->next) { + for (item = litem->items.first; item; item = item->next) { ui_item_size(item, &itemw, &itemh); totw += itemw; tot++; @@ -1712,88 +1712,88 @@ static void ui_litem_layout_row(uiLayout *litem) return; if (w != 0) - w -= (tot-1)*litem->space; - fixedw= 0; + w -= (tot - 1) * litem->space; + fixedw = 0; /* keep clamping items to fixed minimum size until all are done */ do { - freew= 0; - x= 0; - flag= 0; + freew = 0; + x = 0; + flag = 0; - for (item=litem->items.first; item; item=item->next) { + for (item = litem->items.first; item; item = item->next) { if (item->flag) continue; ui_item_size(item, &itemw, &itemh); - minw= ui_litem_min_width(itemw); + minw = ui_litem_min_width(itemw); if (w - lastw > 0) - neww= ui_item_fit(itemw, x, totw, w-lastw, !item->next, litem->alignment, NULL); + neww = ui_item_fit(itemw, x, totw, w - lastw, !item->next, litem->alignment, NULL); else - neww= 0; /* no space left, all will need clamping to minimum size */ + neww = 0; /* no space left, all will need clamping to minimum size */ x += neww; if ((neww < minw || itemw == minw) && w != 0) { /* fixed size */ - item->flag= 1; + item->flag = 1; fixedw += minw; - flag= 1; + flag = 1; totw -= itemw; } else { /* keep free size */ - item->flag= 0; + item->flag = 0; freew += itemw; } } - lastw= fixedw; + lastw = fixedw; } while (flag); - freex= 0; - fixedx= 0; - x= litem->x; + freex = 0; + fixedx = 0; + x = litem->x; - for (item=litem->items.first; item; item=item->next) { + for (item = litem->items.first; item; item = item->next) { ui_item_size(item, &itemw, &itemh); - minw= ui_litem_min_width(itemw); + minw = ui_litem_min_width(itemw); if (item->flag) { /* fixed minimum size items */ - itemw= ui_item_fit(minw, fixedx, fixedw, MIN2(w, fixedw), !item->next, litem->alignment, NULL); + itemw = ui_item_fit(minw, fixedx, fixedw, MIN2(w, fixedw), !item->next, litem->alignment, NULL); fixedx += itemw; } else { /* free size item */ - itemw= ui_item_fit(itemw, freex, freew, w-fixedw, !item->next, litem->alignment, NULL); + itemw = ui_item_fit(itemw, freex, freew, w - fixedw, !item->next, litem->alignment, NULL); freex += itemw; } /* align right/center */ - offset= 0; + offset = 0; if (litem->alignment == UI_LAYOUT_ALIGN_RIGHT) { - if (freew > 0 && freew < w-fixedw) - offset= (w - fixedw) - freew; + if (freew > 0 && freew < w - fixedw) + offset = (w - fixedw) - freew; } else if (litem->alignment == UI_LAYOUT_ALIGN_CENTER) { - if (freew > 0 && freew < w-fixedw) - offset= ((w - fixedw) - freew)/2; + if (freew > 0 && freew < w - fixedw) + offset = ((w - fixedw) - freew) / 2; } /* position item */ - ui_item_position(item, x+offset, y-itemh, itemw, itemh); + ui_item_position(item, x + offset, y - itemh, itemw, itemh); x += itemw; if (item->next) x += litem->space; } - litem->w= x - litem->x; - litem->h= litem->y - y; - litem->x= x; - litem->y= y; + litem->w = x - litem->x; + litem->h = litem->y - y; + litem->x = x; + litem->y = y; } /* single-column layout */ @@ -1802,13 +1802,13 @@ static void ui_litem_estimate_column(uiLayout *litem) uiItem *item; int itemw, itemh; - litem->w= 0; - litem->h= 0; + litem->w = 0; + litem->h = 0; - for (item=litem->items.first; item; item=item->next) { + for (item = litem->items.first; item; item = item->next) { ui_item_size(item, &itemw, &itemh); - litem->w= MAX2(litem->w, itemw); + litem->w = MAX2(litem->w, itemw); litem->h += itemh; if (item->next) @@ -1821,10 +1821,10 @@ static void ui_litem_layout_column(uiLayout *litem) uiItem *item; int itemh, x, y; - x= litem->x; - y= litem->y; + x = litem->x; + y = litem->y; - for (item=litem->items.first; item; item=item->next) { + for (item = litem->items.first; item; item = item->next) { ui_item_size(item, NULL, &itemh); y -= itemh; @@ -1834,9 +1834,9 @@ static void ui_litem_layout_column(uiLayout *litem) y -= litem->space; } - litem->h= litem->y - y; - litem->x= x; - litem->y= y; + litem->h = litem->y - y; + litem->x = x; + litem->y = y; } /* root layout */ @@ -1856,59 +1856,59 @@ static void ui_litem_layout_root(uiLayout *litem) /* box layout */ static void ui_litem_estimate_box(uiLayout *litem) { - uiStyle *style= litem->root->style; + uiStyle *style = litem->root->style; ui_litem_estimate_column(litem); - litem->w += 2*style->boxspace; + litem->w += 2 * style->boxspace; litem->h += style->boxspace; } static void ui_litem_layout_box(uiLayout *litem) { - uiLayoutItemBx *box= (uiLayoutItemBx*)litem; - uiStyle *style= litem->root->style; + uiLayoutItemBx *box = (uiLayoutItemBx *)litem; + uiStyle *style = litem->root->style; uiBut *but; int w, h; - w= litem->w; - h= litem->h; + w = litem->w; + h = litem->h; litem->x += style->boxspace; - if (w != 0) litem->w -= 2*style->boxspace; - if (h != 0) litem->h -= 2*style->boxspace; + if (w != 0) litem->w -= 2 * style->boxspace; + if (h != 0) litem->h -= 2 * style->boxspace; ui_litem_layout_column(litem); litem->x -= style->boxspace; litem->y -= style->boxspace; - if (w != 0) litem->w += 2*style->boxspace; + if (w != 0) litem->w += 2 * style->boxspace; if (h != 0) litem->h += style->boxspace; /* roundbox around the sublayout */ - but= box->roundbox; - but->x1= litem->x; - but->y1= litem->y; - but->x2= litem->x+litem->w; - but->y2= litem->y+litem->h; + but = box->roundbox; + but->x1 = litem->x; + but->y1 = litem->y; + but->x2 = litem->x + litem->w; + but->y2 = litem->y + litem->h; } /* multi-column layout, automatically flowing to the next */ static void ui_litem_estimate_column_flow(uiLayout *litem) { - uiStyle *style= litem->root->style; - uiLayoutItemFlow *flow= (uiLayoutItemFlow*)litem; + uiStyle *style = litem->root->style; + uiLayoutItemFlow *flow = (uiLayoutItemFlow *)litem; uiItem *item; - int col, x, y, emh, emy, miny, itemw, itemh, maxw=0; + int col, x, y, emh, emy, miny, itemw, itemh, maxw = 0; int toth, totitem; /* compute max needed width and total height */ - toth= 0; - totitem= 0; - for (item=litem->items.first; item; item=item->next) { + toth = 0; + totitem = 0; + for (item = litem->items.first; item; item = item->next) { ui_item_size(item, &itemw, &itemh); - maxw= MAX2(maxw, itemw); + maxw = MAX2(maxw, itemw); toth += itemh; totitem++; } @@ -1916,97 +1916,97 @@ static void ui_litem_estimate_column_flow(uiLayout *litem) if (flow->number <= 0) { /* auto compute number of columns, not very good */ if (maxw == 0) { - flow->totcol= 1; + flow->totcol = 1; return; } - flow->totcol= MAX2(litem->root->emw/maxw, 1); - flow->totcol= MIN2(flow->totcol, totitem); + flow->totcol = MAX2(litem->root->emw / maxw, 1); + flow->totcol = MIN2(flow->totcol, totitem); } else - flow->totcol= flow->number; + flow->totcol = flow->number; /* compute sizes */ - x= 0; - y= 0; - emy= 0; - miny= 0; + x = 0; + y = 0; + emy = 0; + miny = 0; - maxw= 0; - emh= toth/flow->totcol; + maxw = 0; + emh = toth / flow->totcol; /* create column per column */ - col= 0; - for (item=litem->items.first; item; item=item->next) { + col = 0; + for (item = litem->items.first; item; item = item->next) { ui_item_size(item, &itemw, &itemh); y -= itemh + style->buttonspacey; - miny= MIN2(miny, y); + miny = MIN2(miny, y); emy -= itemh; - maxw= MAX2(itemw, maxw); + maxw = MAX2(itemw, maxw); /* decide to go to next one */ - if (col < flow->totcol-1 && emy <= -emh) { + if (col < flow->totcol - 1 && emy <= -emh) { x += maxw + litem->space; - maxw= 0; - y= 0; + maxw = 0; + y = 0; col++; } } - litem->w= x; - litem->h= litem->y - miny; + litem->w = x; + litem->h = litem->y - miny; } static void ui_litem_layout_column_flow(uiLayout *litem) { - uiStyle *style= litem->root->style; - uiLayoutItemFlow *flow= (uiLayoutItemFlow*)litem; + uiStyle *style = litem->root->style; + uiLayoutItemFlow *flow = (uiLayoutItemFlow *)litem; uiItem *item; int col, x, y, w, emh, emy, miny, itemw, itemh; int toth, totitem, offset; /* compute max needed width and total height */ - toth= 0; - totitem= 0; - for (item=litem->items.first; item; item=item->next) { + toth = 0; + totitem = 0; + for (item = litem->items.first; item; item = item->next) { ui_item_size(item, &itemw, &itemh); toth += itemh; totitem++; } /* compute sizes */ - x= litem->x; - y= litem->y; - emy= 0; - miny= 0; + x = litem->x; + y = litem->y; + emy = 0; + miny = 0; - w= litem->w - (flow->totcol-1)*style->columnspace; - emh= toth/flow->totcol; + w = litem->w - (flow->totcol - 1) * style->columnspace; + emh = toth / flow->totcol; /* create column per column */ - col= 0; - for (item=litem->items.first; item; item=item->next) { + col = 0; + for (item = litem->items.first; item; item = item->next) { ui_item_size(item, NULL, &itemh); - itemw= ui_item_fit(1, x-litem->x, flow->totcol, w, col == flow->totcol-1, litem->alignment, &offset); + itemw = ui_item_fit(1, x - litem->x, flow->totcol, w, col == flow->totcol - 1, litem->alignment, &offset); y -= itemh; emy -= itemh; - ui_item_position(item, x+offset, y, itemw, itemh); + ui_item_position(item, x + offset, y, itemw, itemh); y -= style->buttonspacey; - miny= MIN2(miny, y); + miny = MIN2(miny, y); /* decide to go to next one */ - if (col < flow->totcol-1 && emy <= -emh) { + if (col < flow->totcol - 1 && emy <= -emh) { x += itemw + style->columnspace; - y= litem->y; + y = litem->y; col++; } } - litem->h= litem->y - miny; - litem->x= x; - litem->y= miny; + litem->h = litem->y - miny; + litem->x = x; + litem->y = miny; } /* free layout */ @@ -2015,20 +2015,20 @@ static void ui_litem_estimate_absolute(uiLayout *litem) uiItem *item; int itemx, itemy, itemw, itemh, minx, miny; - minx= 1e6; - miny= 1e6; - litem->w= 0; - litem->h= 0; + minx = 1e6; + miny = 1e6; + litem->w = 0; + litem->h = 0; - for (item=litem->items.first; item; item=item->next) { + for (item = litem->items.first; item; item = item->next) { ui_item_offset(item, &itemx, &itemy); ui_item_size(item, &itemw, &itemh); - minx= MIN2(minx, itemx); - miny= MIN2(miny, itemy); + minx = MIN2(minx, itemx); + miny = MIN2(miny, itemy); - litem->w= MAX2(litem->w, itemx+itemw); - litem->h= MAX2(litem->h, itemy+itemh); + litem->w = MAX2(litem->w, itemx + itemw); + litem->h = MAX2(litem->h, itemy + itemh); } litem->w -= minx; @@ -2038,59 +2038,59 @@ static void ui_litem_estimate_absolute(uiLayout *litem) static void ui_litem_layout_absolute(uiLayout *litem) { uiItem *item; - float scalex=1.0f, scaley=1.0f; + float scalex = 1.0f, scaley = 1.0f; int x, y, newx, newy, itemx, itemy, itemh, itemw, minx, miny, totw, toth; - minx= 1e6; - miny= 1e6; - totw= 0; - toth= 0; + minx = 1e6; + miny = 1e6; + totw = 0; + toth = 0; - for (item=litem->items.first; item; item=item->next) { + for (item = litem->items.first; item; item = item->next) { ui_item_offset(item, &itemx, &itemy); ui_item_size(item, &itemw, &itemh); - minx= MIN2(minx, itemx); - miny= MIN2(miny, itemy); + minx = MIN2(minx, itemx); + miny = MIN2(miny, itemy); - totw= MAX2(totw, itemx+itemw); - toth= MAX2(toth, itemy+itemh); + totw = MAX2(totw, itemx + itemw); + toth = MAX2(toth, itemy + itemh); } totw -= minx; toth -= miny; if (litem->w && totw > 0) - scalex= (float)litem->w/(float)totw; + scalex = (float)litem->w / (float)totw; if (litem->h && toth > 0) - scaley= (float)litem->h/(float)toth; + scaley = (float)litem->h / (float)toth; - x= litem->x; - y= litem->y - scaley*toth; + x = litem->x; + y = litem->y - scaley * toth; - for (item=litem->items.first; item; item=item->next) { + for (item = litem->items.first; item; item = item->next) { ui_item_offset(item, &itemx, &itemy); ui_item_size(item, &itemw, &itemh); if (scalex != 1.0f) { - newx= (itemx - minx)*scalex; - itemw= (itemx - minx + itemw)*scalex - newx; - itemx= minx + newx; + newx = (itemx - minx) * scalex; + itemw = (itemx - minx + itemw) * scalex - newx; + itemx = minx + newx; } if (scaley != 1.0f) { - newy= (itemy - miny)*scaley; - itemh= (itemy - miny + itemh)*scaley - newy; - itemy= miny + newy; + newy = (itemy - miny) * scaley; + itemh = (itemy - miny + itemh) * scaley - newy; + itemy = miny + newy; } - ui_item_position(item, x+itemx-minx, y+itemy-miny, itemw, itemh); + ui_item_position(item, x + itemx - minx, y + itemy - miny, itemw, itemh); } - litem->w= scalex*totw; - litem->h= litem->y - y; - litem->x= x + litem->w; - litem->y= y; + litem->w = scalex * totw; + litem->h = litem->y - y; + litem->x = x + litem->w; + litem->y = y; } /* split layout */ @@ -2101,42 +2101,42 @@ static void ui_litem_estimate_split(uiLayout *litem) static void ui_litem_layout_split(uiLayout *litem) { - uiLayoutItemSplit *split= (uiLayoutItemSplit*)litem; + uiLayoutItemSplit *split = (uiLayoutItemSplit *)litem; uiItem *item; float percentage; - const int tot= BLI_countlist(&litem->items); - int itemh, x, y, w, colw=0; + const int tot = BLI_countlist(&litem->items); + int itemh, x, y, w, colw = 0; if (tot == 0) return; - x= litem->x; - y= litem->y; + x = litem->x; + y = litem->y; - percentage= (split->percentage == 0.0f)? 1.0f/(float)tot: split->percentage; + percentage = (split->percentage == 0.0f) ? 1.0f / (float)tot : split->percentage; - w= (litem->w - (tot-1)*litem->space); - colw= w*percentage; - colw= MAX2(colw, 0); + w = (litem->w - (tot - 1) * litem->space); + colw = w * percentage; + colw = MAX2(colw, 0); - for (item=litem->items.first; item; item=item->next) { + for (item = litem->items.first; item; item = item->next) { ui_item_size(item, NULL, &itemh); - ui_item_position(item, x, y-itemh, colw, itemh); + ui_item_position(item, x, y - itemh, colw, itemh); x += colw; if (item->next) { - colw= (w - (int)(w*percentage))/(tot-1); - colw= MAX2(colw, 0); + colw = (w - (int)(w * percentage)) / (tot - 1); + colw = MAX2(colw, 0); x += litem->space; } } - litem->w= x - litem->x; - litem->h= litem->y - y; - litem->x= x; - litem->y= y; + litem->w = x - litem->x; + litem->h = litem->y - y; + litem->x = x; + litem->y = y; } /* overlap layout */ @@ -2145,14 +2145,14 @@ static void ui_litem_estimate_overlap(uiLayout *litem) uiItem *item; int itemw, itemh; - litem->w= 0; - litem->h= 0; + litem->w = 0; + litem->h = 0; - for (item=litem->items.first; item; item=item->next) { + for (item = litem->items.first; item; item = item->next) { ui_item_size(item, &itemw, &itemh); - litem->w= MAX2(itemw, litem->w); - litem->h= MAX2(itemh, litem->h); + litem->w = MAX2(itemw, litem->w); + litem->h = MAX2(itemh, litem->h); } } @@ -2161,18 +2161,18 @@ static void ui_litem_layout_overlap(uiLayout *litem) uiItem *item; int itemw, itemh, x, y; - x= litem->x; - y= litem->y; + x = litem->x; + y = litem->y; - for (item=litem->items.first; item; item=item->next) { + for (item = litem->items.first; item; item = item->next) { ui_item_size(item, &itemw, &itemh); - ui_item_position(item, x, y-itemh, litem->w, itemh); + ui_item_position(item, x, y - itemh, litem->w, itemh); - litem->h= MAX2(litem->h, itemh); + litem->h = MAX2(litem->h, itemh); } - litem->x= x; - litem->y= y - litem->h; + litem->x = x; + litem->y = y - litem->h; } /* layout create functions */ @@ -2180,14 +2180,14 @@ uiLayout *uiLayoutRow(uiLayout *layout, int align) { uiLayout *litem; - litem= MEM_callocN(sizeof(uiLayout), "uiLayoutRow"); - litem->item.type= ITEM_LAYOUT_ROW; - litem->root= layout->root; - litem->align= align; - litem->active= 1; - litem->enabled= 1; - litem->context= layout->context; - litem->space= (align)? 0: layout->root->style->buttonspacex; + litem = MEM_callocN(sizeof(uiLayout), "uiLayoutRow"); + litem->item.type = ITEM_LAYOUT_ROW; + litem->root = layout->root; + litem->align = align; + litem->active = 1; + litem->enabled = 1; + litem->context = layout->context; + litem->space = (align) ? 0 : layout->root->style->buttonspacex; litem->w = layout->w; BLI_addtail(&layout->items, litem); @@ -2200,14 +2200,14 @@ uiLayout *uiLayoutColumn(uiLayout *layout, int align) { uiLayout *litem; - litem= MEM_callocN(sizeof(uiLayout), "uiLayoutColumn"); - litem->item.type= ITEM_LAYOUT_COLUMN; - litem->root= layout->root; - litem->align= align; - litem->active= 1; - litem->enabled= 1; - litem->context= layout->context; - litem->space= (litem->align)? 0: layout->root->style->buttonspacey; + litem = MEM_callocN(sizeof(uiLayout), "uiLayoutColumn"); + litem->item.type = ITEM_LAYOUT_COLUMN; + litem->root = layout->root; + litem->align = align; + litem->active = 1; + 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); @@ -2220,16 +2220,16 @@ uiLayout *uiLayoutColumnFlow(uiLayout *layout, int number, int align) { uiLayoutItemFlow *flow; - flow= MEM_callocN(sizeof(uiLayoutItemFlow), "uiLayoutItemFlow"); - flow->litem.item.type= ITEM_LAYOUT_COLUMN_FLOW; - flow->litem.root= layout->root; - flow->litem.align= align; - flow->litem.active= 1; - flow->litem.enabled= 1; - flow->litem.context= layout->context; - flow->litem.space= (flow->litem.align)? 0: layout->root->style->columnspace; + flow = MEM_callocN(sizeof(uiLayoutItemFlow), "uiLayoutItemFlow"); + flow->litem.item.type = ITEM_LAYOUT_COLUMN_FLOW; + flow->litem.root = layout->root; + flow->litem.align = align; + flow->litem.active = 1; + 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; + flow->number = number; BLI_addtail(&layout->items, flow); uiBlockSetCurLayout(layout->root->block, &flow->litem); @@ -2241,52 +2241,52 @@ static uiLayoutItemBx *ui_layout_box(uiLayout *layout, int type) { uiLayoutItemBx *box; - box= MEM_callocN(sizeof(uiLayoutItemBx), "uiLayoutItemBx"); - box->litem.item.type= ITEM_LAYOUT_BOX; - box->litem.root= layout->root; - box->litem.active= 1; - box->litem.enabled= 1; - box->litem.context= layout->context; - box->litem.space= layout->root->style->columnspace; + box = MEM_callocN(sizeof(uiLayoutItemBx), "uiLayoutItemBx"); + box->litem.item.type = ITEM_LAYOUT_BOX; + box->litem.root = layout->root; + box->litem.active = 1; + 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); - box->roundbox= uiDefBut(layout->root->block, type, 0, "", 0, 0, 0, 0, NULL, 0.0, 0.0, 0, 0, ""); + box->roundbox = uiDefBut(layout->root->block, type, 0, "", 0, 0, 0, 0, NULL, 0.0, 0.0, 0, 0, ""); return box; } uiLayout *uiLayoutBox(uiLayout *layout) { - return (uiLayout*)ui_layout_box(layout, ROUNDBOX); + return (uiLayout *)ui_layout_box(layout, ROUNDBOX); } uiLayout *uiLayoutListBox(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, PointerRNA *actptr, PropertyRNA *actprop) { - uiLayoutItemBx *box= ui_layout_box(layout, LISTBOX); - uiBut *but= box->roundbox; + uiLayoutItemBx *box = ui_layout_box(layout, LISTBOX); + uiBut *but = box->roundbox; - but->rnasearchpoin= *ptr; - but->rnasearchprop= prop; - but->rnapoin= *actptr; - but->rnaprop= actprop; + but->rnasearchpoin = *ptr; + but->rnasearchprop = prop; + but->rnapoin = *actptr; + but->rnaprop = actprop; - return (uiLayout*)box; + return (uiLayout *)box; } uiLayout *uiLayoutAbsolute(uiLayout *layout, int align) { uiLayout *litem; - litem= MEM_callocN(sizeof(uiLayout), "uiLayoutAbsolute"); - litem->item.type= ITEM_LAYOUT_ABSOLUTE; - litem->root= layout->root; - litem->align= align; - litem->active= 1; - litem->enabled= 1; - litem->context= layout->context; + litem = MEM_callocN(sizeof(uiLayout), "uiLayoutAbsolute"); + litem->item.type = ITEM_LAYOUT_ABSOLUTE; + litem->root = layout->root; + litem->align = align; + litem->active = 1; + litem->enabled = 1; + litem->context = layout->context; BLI_addtail(&layout->items, litem); uiBlockSetCurLayout(layout->root->block, litem); @@ -2298,7 +2298,7 @@ uiBlock *uiLayoutAbsoluteBlock(uiLayout *layout) { uiBlock *block; - block= uiLayoutGetBlock(layout); + block = uiLayoutGetBlock(layout); uiLayoutAbsolute(layout, 0); return block; @@ -2308,12 +2308,12 @@ uiLayout *uiLayoutOverlap(uiLayout *layout) { uiLayout *litem; - litem= MEM_callocN(sizeof(uiLayout), "uiLayoutOverlap"); - litem->item.type= ITEM_LAYOUT_OVERLAP; - litem->root= layout->root; - litem->active= 1; - litem->enabled= 1; - litem->context= layout->context; + litem = MEM_callocN(sizeof(uiLayout), "uiLayoutOverlap"); + litem->item.type = ITEM_LAYOUT_OVERLAP; + litem->root = layout->root; + litem->active = 1; + litem->enabled = 1; + litem->context = layout->context; BLI_addtail(&layout->items, litem); uiBlockSetCurLayout(layout->root->block, litem); @@ -2325,16 +2325,16 @@ uiLayout *uiLayoutSplit(uiLayout *layout, float percentage, int align) { uiLayoutItemSplit *split; - split= MEM_callocN(sizeof(uiLayoutItemSplit), "uiLayoutItemSplit"); - 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; - split->litem.space= layout->root->style->columnspace; - split->litem.w= layout->w; - split->percentage= percentage; + split = MEM_callocN(sizeof(uiLayoutItemSplit), "uiLayoutItemSplit"); + 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; + split->litem.space = layout->root->style->columnspace; + split->litem.w = layout->w; + split->percentage = percentage; BLI_addtail(&layout->items, split); uiBlockSetCurLayout(layout->root->block, &split->litem); @@ -2344,37 +2344,37 @@ uiLayout *uiLayoutSplit(uiLayout *layout, float percentage, int align) void uiLayoutSetActive(uiLayout *layout, int active) { - layout->active= active; + layout->active = active; } void uiLayoutSetEnabled(uiLayout *layout, int enabled) { - layout->enabled= enabled; + layout->enabled = enabled; } void uiLayoutSetRedAlert(uiLayout *layout, int redalert) { - layout->redalert= redalert; + layout->redalert = redalert; } void uiLayoutSetKeepAspect(uiLayout *layout, int keepaspect) { - layout->keepaspect= keepaspect; + layout->keepaspect = keepaspect; } void uiLayoutSetAlignment(uiLayout *layout, int alignment) { - layout->alignment= alignment; + layout->alignment = alignment; } void uiLayoutSetScaleX(uiLayout *layout, float scale) { - layout->scale[0]= scale; + layout->scale[0] = scale; } void uiLayoutSetScaleY(uiLayout *layout, float scale) { - layout->scale[1]= scale; + layout->scale[1] = scale; } int uiLayoutGetActive(uiLayout *layout) @@ -2424,7 +2424,7 @@ static void ui_item_scale(uiLayout *litem, float scale[2]) uiItem *item; int x, y, w, h; - for (item=litem->items.last; item; item=item->prev) { + for (item = litem->items.last; item; item = item->prev) { ui_item_size(item, &w, &h); ui_item_offset(item, &x, &y); @@ -2447,9 +2447,9 @@ static void ui_item_estimate(uiItem *item) uiItem *subitem; if (item->type != ITEM_BUTTON) { - uiLayout *litem= (uiLayout*)item; + uiLayout *litem = (uiLayout *)item; - for (subitem=litem->items.first; subitem; subitem=subitem->next) + for (subitem = litem->items.first; subitem; subitem = subitem->next) ui_item_estimate(subitem); if (litem->items.first == NULL) @@ -2458,7 +2458,7 @@ static void ui_item_estimate(uiItem *item) if (litem->scale[0] != 0.0f || litem->scale[1] != 0.0f) ui_item_scale(litem, litem->scale); - switch(litem->item.type) { + switch (litem->item.type) { case ITEM_LAYOUT_COLUMN: ui_litem_estimate_column(litem); break; @@ -2495,23 +2495,23 @@ static void ui_item_align(uiLayout *litem, short nr) uiButtonItem *bitem; uiLayoutItemBx *box; - for (item=litem->items.last; item; item=item->prev) { + for (item = litem->items.last; item; item = item->prev) { if (item->type == ITEM_BUTTON) { - bitem= (uiButtonItem*)item; + bitem = (uiButtonItem *)item; if (ui_but_can_align(bitem->but)) if (!bitem->but->alignnr) - bitem->but->alignnr= nr; + bitem->but->alignnr = nr; } - else if (item->type == ITEM_LAYOUT_ABSOLUTE); - else if (item->type == ITEM_LAYOUT_OVERLAP); + else if (item->type == ITEM_LAYOUT_ABSOLUTE) ; + else if (item->type == ITEM_LAYOUT_OVERLAP) ; else if (item->type == ITEM_LAYOUT_BOX) { - box= (uiLayoutItemBx*)item; - box->roundbox->alignnr= nr; + box = (uiLayoutItemBx *)item; + box->roundbox->alignnr = nr; BLI_remlink(&litem->root->block->buttons, box->roundbox); BLI_addhead(&litem->root->block->buttons, box->roundbox); } else - ui_item_align((uiLayout*)item, nr); + ui_item_align((uiLayout *)item, nr); } } @@ -2520,13 +2520,13 @@ static void ui_item_flag(uiLayout *litem, int flag) uiItem *item; uiButtonItem *bitem; - for (item=litem->items.last; item; item=item->prev) { + for (item = litem->items.last; item; item = item->prev) { if (item->type == ITEM_BUTTON) { - bitem= (uiButtonItem*)item; + bitem = (uiButtonItem *)item; bitem->but->flag |= flag; } else - ui_item_flag((uiLayout*)item, flag); + ui_item_flag((uiLayout *)item, flag); } } @@ -2535,7 +2535,7 @@ static void ui_item_layout(uiItem *item) uiItem *subitem; if (item->type != ITEM_BUTTON) { - uiLayout *litem= (uiLayout*)item; + uiLayout *litem = (uiLayout *)item; if (litem->items.first == NULL) return; @@ -2547,7 +2547,7 @@ static void ui_item_layout(uiItem *item) if (!litem->enabled) ui_item_flag(litem, UI_BUT_DISABLED); - switch(litem->item.type) { + switch (litem->item.type) { case ITEM_LAYOUT_COLUMN: ui_litem_layout_column(litem); break; @@ -2576,7 +2576,7 @@ static void ui_item_layout(uiItem *item) break; } - for (subitem=litem->items.first; subitem; subitem=subitem->next) + for (subitem = litem->items.first; subitem; subitem = subitem->next) ui_item_layout(subitem); } } @@ -2589,21 +2589,21 @@ static void ui_layout_end(uiBlock *block, uiLayout *layout, int *x, int *y) ui_item_estimate(&layout->item); ui_item_layout(&layout->item); - if (x) *x= layout->x; - if (y) *y= layout->y; + if (x) *x = layout->x; + if (y) *y = layout->y; } static void ui_layout_free(uiLayout *layout) { uiItem *item, *next; - for (item=layout->items.first; item; item=next) { - next= item->next; + for (item = layout->items.first; item; item = next) { + next = item->next; if (item->type == ITEM_BUTTON) MEM_freeN(item); else - ui_layout_free((uiLayout*)item); + ui_layout_free((uiLayout *)item); } MEM_freeN(layout); @@ -2614,37 +2614,37 @@ uiLayout *uiBlockLayout(uiBlock *block, int dir, int type, int x, int y, int siz uiLayout *layout; uiLayoutRoot *root; - root= MEM_callocN(sizeof(uiLayoutRoot), "uiLayoutRoot"); - root->type= type; - root->style= style; - root->block= block; - root->opcontext= WM_OP_INVOKE_REGION_WIN; + root = MEM_callocN(sizeof(uiLayoutRoot), "uiLayoutRoot"); + root->type = type; + root->style = style; + root->block = block; + root->opcontext = WM_OP_INVOKE_REGION_WIN; - layout= MEM_callocN(sizeof(uiLayout), "uiLayout"); - layout->item.type= ITEM_LAYOUT_ROOT; + layout = MEM_callocN(sizeof(uiLayout), "uiLayout"); + layout->item.type = ITEM_LAYOUT_ROOT; - layout->x= x; - layout->y= y; - layout->root= root; - layout->space= style->templatespace; - layout->active= 1; - layout->enabled= 1; - layout->context= NULL; + layout->x = x; + layout->y = y; + layout->root = root; + layout->space = style->templatespace; + layout->active = 1; + layout->enabled = 1; + layout->context = NULL; if (type == UI_LAYOUT_MENU) - layout->space= 0; + layout->space = 0; if (dir == UI_LAYOUT_HORIZONTAL) { - layout->h= size; - layout->root->emh= em*UI_UNIT_Y; + layout->h = size; + layout->root->emh = em * UI_UNIT_Y; } else { - layout->w= size; - layout->root->emw= em*UI_UNIT_X; + layout->w = size; + layout->root->emw = em * UI_UNIT_X; } - block->curlayout= layout; - root->layout= layout; + block->curlayout = layout; + root->layout = layout; BLI_addtail(&block->layouts, root); return layout; @@ -2663,45 +2663,45 @@ int uiLayoutGetOperatorContext(uiLayout *layout) void uiBlockSetCurLayout(uiBlock *block, uiLayout *layout) { - block->curlayout= layout; + block->curlayout = layout; } void ui_layout_add_but(uiLayout *layout, uiBut *but) { uiButtonItem *bitem; - bitem= MEM_callocN(sizeof(uiButtonItem), "uiButtonItem"); - bitem->item.type= ITEM_BUTTON; - bitem->but= but; + bitem = MEM_callocN(sizeof(uiButtonItem), "uiButtonItem"); + bitem->item.type = ITEM_BUTTON; + bitem->but = but; BLI_addtail(&layout->items, bitem); if (layout->context) { - but->context= layout->context; - but->context->used= 1; + but->context = layout->context; + but->context->used = 1; } } void uiLayoutSetOperatorContext(uiLayout *layout, int opcontext) { - layout->root->opcontext= opcontext; + layout->root->opcontext = opcontext; } void uiLayoutSetFunc(uiLayout *layout, uiMenuHandleFunc handlefunc, void *argv) { - layout->root->handlefunc= handlefunc; - layout->root->argv= argv; + layout->root->handlefunc = handlefunc; + layout->root->argv = argv; } void uiBlockLayoutResolve(uiBlock *block, int *x, int *y) { uiLayoutRoot *root; - if (x) *x= 0; - if (y) *y= 0; + if (x) *x = 0; + if (y) *y = 0; - block->curlayout= NULL; + block->curlayout = NULL; - for (root=block->layouts.first; root; root=root->next) { + for (root = block->layouts.first; root; root = root->next) { /* NULL in advance so we don't interfere when adding button */ ui_layout_end(block, root->layout, x, y); ui_layout_free(root->layout); @@ -2718,8 +2718,8 @@ void uiBlockLayoutResolve(uiBlock *block, int *x, int *y) void uiLayoutSetContextPointer(uiLayout *layout, const char *name, PointerRNA *ptr) { - uiBlock *block= layout->root->block; - layout->context= CTX_store_add(&block->contexts, name, ptr); + uiBlock *block = layout->root->block; + layout->context = CTX_store_add(&block->contexts, name, ptr); } @@ -2751,33 +2751,33 @@ static void ui_intro_items(DynStr *ds, ListBase *lb) BLI_dynstr_append(ds, "["); - for (item=lb->first; item; item=item->next) { + for (item = lb->first; item; item = item->next) { BLI_dynstr_append(ds, "{"); /* could also use the INT but this is nicer*/ - switch(item->type) { - case ITEM_BUTTON: BLI_dynstr_append(ds, "'type':'BUTTON', ");break; - case ITEM_LAYOUT_ROW: BLI_dynstr_append(ds, "'type':'ROW', "); break; - case ITEM_LAYOUT_COLUMN: BLI_dynstr_append(ds, "'type':'COLUMN', "); break; - case ITEM_LAYOUT_COLUMN_FLOW:BLI_dynstr_append(ds, "'type':'COLUMN_FLOW', "); break; - case ITEM_LAYOUT_ROW_FLOW: BLI_dynstr_append(ds, "'type':'ROW_FLOW', "); break; - case ITEM_LAYOUT_BOX: BLI_dynstr_append(ds, "'type':'BOX', "); break; - case ITEM_LAYOUT_ABSOLUTE: BLI_dynstr_append(ds, "'type':'ABSOLUTE', "); break; - case ITEM_LAYOUT_SPLIT: BLI_dynstr_append(ds, "'type':'SPLIT', "); break; - case ITEM_LAYOUT_OVERLAP: BLI_dynstr_append(ds, "'type':'OVERLAP', "); break; - case ITEM_LAYOUT_ROOT: BLI_dynstr_append(ds, "'type':'ROOT', "); break; - default: BLI_dynstr_append(ds, "'type':'UNKNOWN', "); break; + switch (item->type) { + case ITEM_BUTTON: BLI_dynstr_append(ds, "'type':'BUTTON', "); break; + case ITEM_LAYOUT_ROW: BLI_dynstr_append(ds, "'type':'ROW', "); break; + case ITEM_LAYOUT_COLUMN: BLI_dynstr_append(ds, "'type':'COLUMN', "); break; + case ITEM_LAYOUT_COLUMN_FLOW: BLI_dynstr_append(ds, "'type':'COLUMN_FLOW', "); break; + case ITEM_LAYOUT_ROW_FLOW: BLI_dynstr_append(ds, "'type':'ROW_FLOW', "); break; + case ITEM_LAYOUT_BOX: BLI_dynstr_append(ds, "'type':'BOX', "); break; + case ITEM_LAYOUT_ABSOLUTE: BLI_dynstr_append(ds, "'type':'ABSOLUTE', "); break; + case ITEM_LAYOUT_SPLIT: BLI_dynstr_append(ds, "'type':'SPLIT', "); break; + case ITEM_LAYOUT_OVERLAP: BLI_dynstr_append(ds, "'type':'OVERLAP', "); break; + case ITEM_LAYOUT_ROOT: BLI_dynstr_append(ds, "'type':'ROOT', "); break; + default: BLI_dynstr_append(ds, "'type':'UNKNOWN', "); break; } - switch(item->type) { - case ITEM_BUTTON: - ui_intro_button(ds, (uiButtonItem *)item); - break; - default: - BLI_dynstr_append(ds, "'items':"); - ui_intro_items(ds, &((uiLayout*)item)->items); - break; + switch (item->type) { + case ITEM_BUTTON: + ui_intro_button(ds, (uiButtonItem *)item); + break; + default: + BLI_dynstr_append(ds, "'items':"); + ui_intro_items(ds, &((uiLayout *)item)->items); + break; } BLI_dynstr_append(ds, "}"); @@ -2796,7 +2796,7 @@ static void ui_intro_uiLayout(DynStr *ds, uiLayout *layout) static char *str = NULL; // XXX, constant re-freeing, far from ideal. const char *uiLayoutIntrospect(uiLayout *layout) { - DynStr *ds= BLI_dynstr_new(); + DynStr *ds = BLI_dynstr_new(); if (str) { MEM_freeN(str); @@ -2816,11 +2816,11 @@ static void ui_layout_operator_buts__reset_cb(bContext *UNUSED(C), void *op_pt, } /* this function does not initialize the layout, functions can be called on the layout before and after */ -void uiLayoutOperatorButs(const bContext *C, uiLayout *layout, wmOperator *op,int (*check_prop)(struct PointerRNA *, struct PropertyRNA *), const char label_align, const short flag) +void uiLayoutOperatorButs(const bContext *C, uiLayout *layout, wmOperator *op, int (*check_prop)(struct PointerRNA *, struct PropertyRNA *), const char label_align, const short flag) { if (!op->properties) { IDPropertyTemplate val = {0}; - op->properties= IDP_New(IDP_GROUP, &val, "wmOperatorProperties"); + op->properties = IDP_New(IDP_GROUP, &val, "wmOperatorProperties"); } if (flag & UI_LAYOUT_OP_SHOW_TITLE) { @@ -2840,37 +2840,37 @@ void uiLayoutOperatorButs(const bContext *C, uiLayout *layout, wmOperator *op,in PointerRNA op_ptr; uiLayout *row; - uiLayoutGetBlock(layout)->ui_operator= op; + uiLayoutGetBlock(layout)->ui_operator = op; - row= uiLayoutRow(layout, TRUE); + row = uiLayoutRow(layout, TRUE); uiItemM(row, (bContext *)C, "WM_MT_operator_presets", NULL, ICON_NONE); WM_operator_properties_create(&op_ptr, "WM_OT_operator_preset_add"); RNA_string_set(&op_ptr, "operator", op->type->idname); - op_ptr= uiItemFullO(row, "WM_OT_operator_preset_add", "", ICON_ZOOMIN, op_ptr.data, WM_OP_INVOKE_DEFAULT, 0); + op_ptr = uiItemFullO(row, "WM_OT_operator_preset_add", "", ICON_ZOOMIN, op_ptr.data, WM_OP_INVOKE_DEFAULT, 0); WM_operator_properties_create(&op_ptr, "WM_OT_operator_preset_add"); RNA_string_set(&op_ptr, "operator", op->type->idname); RNA_boolean_set(&op_ptr, "remove_active", TRUE); - op_ptr= uiItemFullO(row, "WM_OT_operator_preset_add", "", ICON_ZOOMOUT, op_ptr.data, WM_OP_INVOKE_DEFAULT, 0); + op_ptr = uiItemFullO(row, "WM_OT_operator_preset_add", "", ICON_ZOOMOUT, op_ptr.data, WM_OP_INVOKE_DEFAULT, 0); } if (op->type->ui) { - op->layout= layout; - op->type->ui((bContext*)C, op); - op->layout= NULL; + op->layout = layout; + op->type->ui((bContext *)C, op); + op->layout = NULL; /* UI_LAYOUT_OP_SHOW_EMPTY ignored */ } else { - wmWindowManager *wm= CTX_wm_manager(C); + wmWindowManager *wm = CTX_wm_manager(C); PointerRNA ptr; int empty; RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr); /* main draw call */ - empty= uiDefAutoButsRNA(layout, &ptr, check_prop, label_align) == 0; + empty = uiDefAutoButsRNA(layout, &ptr, check_prop, label_align) == 0; if (empty && (flag & UI_LAYOUT_OP_SHOW_EMPTY)) { uiItemL(layout, IFACE_("No Properties"), ICON_NONE); @@ -2885,9 +2885,9 @@ void uiLayoutOperatorButs(const bContext *C, uiLayout *layout, wmOperator *op,in uiBut *but; uiLayout *col; /* needed to avoid alignment errors with previous buttons */ - col= uiLayoutColumn(layout, 0); - block= uiLayoutGetBlock(col); - but = uiDefIconTextBut(block , BUT, 0, ICON_FILE_REFRESH, IFACE_("Reset"), 0, 0, 18, 20, + col = uiLayoutColumn(layout, 0); + block = uiLayoutGetBlock(col); + but = uiDefIconTextBut(block, BUT, 0, ICON_FILE_REFRESH, IFACE_("Reset"), 0, 0, 18, 20, NULL, 0.0, 0.0, 0.0, 0.0, TIP_("Reset operator defaults")); uiButSetFunc(but, ui_layout_operator_buts__reset_cb, op, NULL); } @@ -2896,7 +2896,7 @@ void uiLayoutOperatorButs(const bContext *C, uiLayout *layout, wmOperator *op,in { uiBut *but; - for (but= uiLayoutGetBlock(layout)->buttons.first; but; but= but->next) { + for (but = uiLayoutGetBlock(layout)->buttons.first; but; but = but->next) { /* no undo for buttons for operator redo panels */ uiButClearFlag(but, UI_BUT_UNDO); |