From 9598990b9b6ef4fb129943ea1288d9087dff9f9b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 30 Jan 2014 15:28:39 +1100 Subject: UI API: don't use a text label when icon_only is set --- source/blender/editors/interface/interface_layout.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/interface') diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index d2099334efb..e10baa35d0d 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -728,7 +728,7 @@ PointerRNA uiItemFullO_ptr(uiLayout *layout, wmOperatorType *ot, const char *nam int w; if (!name) { - if (ot && ot->srna) + if (ot && ot->srna && (flag & UI_ITEM_R_ICON_ONLY) == 0) name = RNA_struct_ui_name(ot->srna); else name = ""; @@ -1159,8 +1159,15 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index len = (is_array) ? RNA_property_array_length(ptr, prop) : 0; /* set name and icon */ - if (!name) - name = RNA_property_ui_name(prop); + if (!name) { + if ((flag & UI_ITEM_R_ICON_ONLY) == 0) { + name = RNA_property_ui_name(prop); + } + else { + name = ""; + } + } + if (icon == ICON_NONE) icon = RNA_property_ui_icon(prop); -- cgit v1.2.3