Skip to content

Commit 96d1bb1

Browse files
committed
small fixes
1 parent f124cd4 commit 96d1bb1

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

Directory.Build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<PackageProjectUrl>https://github.com/rds1983/Myra</PackageProjectUrl>
77
<RootNamespace>Myra</RootNamespace>
88
<Description>UI Library for MonoGame, FNA and Stride</Description>
9-
<VersionPrefix>1.5.9</VersionPrefix>
10-
<XNAssetsVersion>0.7.5</XNAssetsVersion>
11-
<FontStashSharpVersion>1.3.9</FontStashSharpVersion>
9+
<VersionPrefix>1.5.10</VersionPrefix>
10+
<XNAssetsVersion>0.7.7</XNAssetsVersion>
11+
<FontStashSharpVersion>1.4.1</FontStashSharpVersion>
1212
<LangVersion>8.0</LangVersion>
1313
<InfoLundinMathVersion>1.2.6</InfoLundinMathVersion>
1414
<MonoGameVersion>3.8.0.1641</MonoGameVersion>

src/Myra/Graphics2D/UI/Selectors/Menu.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,9 +482,15 @@ private void InsertItem(IMenuItem item, int index)
482482
}
483483
else
484484
{
485-
menuItem.ImageWidget.ApplyPressableImageStyle(MenuStyle.ImageStyle);
485+
if (MenuStyle.ImageStyle != null)
486+
{
487+
menuItem.ImageWidget.ApplyPressableImageStyle(MenuStyle.ImageStyle);
488+
}
486489
menuItem.Label.ApplyLabelStyle(MenuStyle.LabelStyle);
487-
menuItem.Shortcut.ApplyLabelStyle(MenuStyle.ShortcutStyle);
490+
if (MenuStyle.ShortcutStyle != null)
491+
{
492+
menuItem.Shortcut.ApplyLabelStyle(MenuStyle.ShortcutStyle);
493+
}
488494
}
489495

490496
// Add only label, as other widgets(image and shortcut) would be optionally added by SetMenuItem

0 commit comments

Comments
 (0)