diff --git a/src/Lively/Lively.UI.WinUI/Assets/CustomIcons.ttf b/src/Lively/Lively.UI.WinUI/Assets/CustomIcons.ttf index b3f13ca9..2cc4edbf 100644 Binary files a/src/Lively/Lively.UI.WinUI/Assets/CustomIcons.ttf and b/src/Lively/Lively.UI.WinUI/Assets/CustomIcons.ttf differ diff --git a/src/Lively/Lively.UI.WinUI/Views/MainWindow.xaml b/src/Lively/Lively.UI.WinUI/Views/MainWindow.xaml index 9b87ae26..ea4a405c 100644 --- a/src/Lively/Lively.UI.WinUI/Views/MainWindow.xaml +++ b/src/Lively/Lively.UI.WinUI/Views/MainWindow.xaml @@ -158,7 +158,10 @@ x:Uid="ActiveWallpapers" Click="ControlPanelButton_Click"> - + - + diff --git a/src/Lively/Lively.UI.WinUI/Views/MainWindow.xaml.cs b/src/Lively/Lively.UI.WinUI/Views/MainWindow.xaml.cs index ceda55ca..764b849a 100644 --- a/src/Lively/Lively.UI.WinUI/Views/MainWindow.xaml.cs +++ b/src/Lively/Lively.UI.WinUI/Views/MainWindow.xaml.cs @@ -226,6 +226,7 @@ private void DesktopCore_WallpaperChanged(object sender, EventArgs e) } } controlPanelLabel.Label = $"{desktopCore.Wallpapers.Count} {i18n.GetString("ActiveWallpapers/Label")}"; + controlPanelMonitor.Glyph = monitorGlyphs[desktopCore.Wallpapers.Count >= monitorGlyphs.Length ? monitorGlyphs.Length - 1 : desktopCore.Wallpapers.Count]; }); } @@ -815,6 +816,16 @@ public static string GetEnumMemberAttrValue(T enumVal) where T : Enum new FontIcon(){ Glyph = "\uE995" }, }; + private readonly string[] monitorGlyphs = + { + "\uE900", + "\uE901", + "\uE902", + "\uE903", + "\uE904", + "\uE905", + }; + private static NavigationViewItem CreateMenu(string menuName, string tag, string glyph = "") { var item = new NavigationViewItem diff --git a/src/Lively/Lively.UI.WinUI/Views/Pages/AboutView.xaml b/src/Lively/Lively.UI.WinUI/Views/Pages/AboutView.xaml index 4fa28ce7..816af7f2 100644 --- a/src/Lively/Lively.UI.WinUI/Views/Pages/AboutView.xaml +++ b/src/Lively/Lively.UI.WinUI/Views/Pages/AboutView.xaml @@ -38,27 +38,27 @@ - + - + - + - + - +