archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fixed Layout-Engine bug that was causing checkbox menu entries to draw with the wrong icon when enabled.

Browse Source
This commit is contained in:
Joshua Leung
2009-10-19 09:50:02 +00:00
parent 0445ff1ae9
commit 73d0c673e8
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/interface/interface_layout.c
View File

@@ -892,10 +892,13 @@ void uiItemFullR(uiLayout *layout, char *name, int icon, PointerRNA *ptr, Proper
name= ui_item_name_add_colon(name, namestr);
if(layout->root->type == UI_LAYOUT_MENU) {
if(type == PROP_BOOLEAN)
icon= (RNA_property_boolean_get(ptr, prop))? ICON_CHECKBOX_HLT: ICON_CHECKBOX_DEHLT;
else if(type == PROP_ENUM && index == RNA_ENUM_VALUE)
icon= (RNA_property_enum_get(ptr, prop) == value)? ICON_CHECKBOX_HLT: ICON_CHECKBOX_DEHLT;
/* whether the property is actually enabled doesn't matter,
* since the widget code for drawing toggles takes care of the
* rest (i.e. given the deactivated icon, it finds the active one
* based on the state of the setting)
*/
if ( (type == PROP_BOOLEAN) || (type==PROP_ENUM && index==RNA_ENUM_VALUE) )
icon= ICON_CHECKBOX_DEHLT; /* ICON_CHECKBOX_HLT when on... */
}
slider= (flag & UI_ITEM_R_SLIDER);