RNA_property_enum_items(&ptr, prop, &item, &totitem);
for(i=0; i<totitem; i++)
- uiItemEnumO(layout, NULL, 0, opname, propname, item[i].value);
+ uiItemEnumO(layout, (char*)item[i].name, item[i].icon, opname, propname, item[i].value);
}
}
else if(ui_layout_vary_direction(layout) == UI_ITEM_VARY_X) {
if(type == PROP_BOOLEAN && strcmp(name, "") != 0)
w += UI_UNIT_X;
+ else if(type == PROP_ENUM)
+ w += UI_UNIT_X/2;
}
*r_w= w;
if(!icon)
icon= RNA_property_ui_icon(prop);
- if(ELEM5(type, PROP_INT, PROP_FLOAT, PROP_STRING, PROP_ENUM, PROP_POINTER))
+ if(ELEM4(type, PROP_INT, PROP_FLOAT, PROP_STRING, PROP_POINTER))
name= ui_item_name_add_colon(name, namestr);
- if(type == PROP_BOOLEAN && len)
+ else if(type == PROP_BOOLEAN && len)
+ 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);
if(layout->root->type == UI_LAYOUT_MENU) {
totw -= minx;
toth -= miny;
- if(litem->w && totw > litem->w)
+ if(litem->w && totw > 0)
scalex= (float)litem->w/(float)totw;
- if(litem->h && toth > litem->h)
+ if(litem->h && toth > 0)
scaley= (float)litem->h/(float)toth;
x= litem->x;
ui_item_size(item, &itemw, &itemh);
if(scalex != 1.0f) {
- newx= itemx*scalex;
- itemw= (itemx + itemw)*scalex - newx;
- itemx= newx;
+ newx= (itemx - minx)*scalex;
+ itemw= (itemx - minx + itemw)*scalex - newx;
+ itemx= minx + newx;
}
if(scaley != 1.0f) {
- newy= itemy*scaley;
- itemh= (itemy + itemh)*scaley - newy;
- itemy= 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);
RNA_def_property_ui_text(prop, "Toolbox Column Layout", "Use a column layout for toolbox.");
prop= RNA_def_property(srna, "directional_menus", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_DIRECTIONALORDER);
+ RNA_def_property_boolean_negative_sdna(prop, NULL, "uiflag", USER_MENUFIXEDORDER);
RNA_def_property_ui_text(prop, "Contents Follow Opening Direction", "Otherwise menus, etc will always be top to bottom, left to right, no matter opening direction.");
/* snap to grid */