diff options
Diffstat (limited to 'src/ui/util.c')
-rw-r--r-- | src/ui/util.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ui/util.c b/src/ui/util.c index 6df4e980..b875e260 100644 --- a/src/ui/util.c +++ b/src/ui/util.c | |||
@@ -725,10 +725,11 @@ iWidget *makeMenu_Widget(iWidget *parent, const iMenuItem *items, size_t n) { | |||
725 | iClob(newKeyMods_LabelWidget(labelText, item->key, item->kmods, item->command)), | 725 | iClob(newKeyMods_LabelWidget(labelText, item->key, item->kmods, item->command)), |
726 | noBackground_WidgetFlag | frameless_WidgetFlag | alignLeft_WidgetFlag | | 726 | noBackground_WidgetFlag | frameless_WidgetFlag | alignLeft_WidgetFlag | |
727 | drawKey_WidgetFlag | itemFlags); | 727 | drawKey_WidgetFlag | itemFlags); |
728 | setWrap_LabelWidget(label, isInfo); | 728 | setWrap_LabelWidget(label, isInfo); |
729 | haveIcons |= checkIcon_LabelWidget(label); | 729 | haveIcons |= checkIcon_LabelWidget(label); |
730 | updateSize_LabelWidget(label); /* drawKey was set */ | 730 | updateSize_LabelWidget(label); /* drawKey was set */ |
731 | if (isInfo) { | 731 | if (isInfo) { |
732 | setFlags_Widget(as_Widget(label), fixedHeight_WidgetFlag, iTrue); /* wrap changes height */ | ||
732 | setTextColor_LabelWidget(label, uiTextAction_ColorId); | 733 | setTextColor_LabelWidget(label, uiTextAction_ColorId); |
733 | } | 734 | } |
734 | } | 735 | } |
@@ -745,7 +746,7 @@ iWidget *makeMenu_Widget(iWidget *parent, const iMenuItem *items, size_t n) { | |||
745 | iForEach(ObjectList, i, children_Widget(menu)) { | 746 | iForEach(ObjectList, i, children_Widget(menu)) { |
746 | if (isInstance_Object(i.object, &Class_LabelWidget)) { | 747 | if (isInstance_Object(i.object, &Class_LabelWidget)) { |
747 | iLabelWidget *label = i.object; | 748 | iLabelWidget *label = i.object; |
748 | if (icon_LabelWidget(label) == 0) { | 749 | if (!isWrapped_LabelWidget(label) && icon_LabelWidget(label) == 0) { |
749 | setIcon_LabelWidget(label, ' '); | 750 | setIcon_LabelWidget(label, ' '); |
750 | } | 751 | } |
751 | } | 752 | } |