forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:buggins/dlangui

This commit is contained in:
Vadim Lopatin 2016-05-04 09:17:35 +03:00
parent 56658e2802 bf024b9ba1
commit 4e2addbcd0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dlangui/widgets/menu.d
View File

@ -211,7 +211,7 @@ class MenuItem {
} }
/// returns item label /// returns item label
@property UIString label() { @property UIString label() {
return _action.labelValue; return _action !is null ? _action.labelValue : UIString("");
} }
/// returns item action /// returns item action
@property const(Action) action() const { return _action; } @property const(Action) action() const { return _action; }
@ -372,7 +372,7 @@ class MenuItemWidget : WidgetGroupDefaultDrawing {
_item = item; _item = item;
styleId = STYLE_MENU_ITEM; styleId = STYLE_MENU_ITEM;
updateState(); updateState();
string iconId = _item.action.iconId; string iconId = _item.action !is null ? _item.action.iconId : "";
if (_item.type == MenuItemType.Check) if (_item.type == MenuItemType.Check)
iconId = "btn_check"; iconId = "btn_check";
else if (_item.type == MenuItemType.Radio) else if (_item.type == MenuItemType.Radio)