diff --git a/src/modules/Workspaces/WorkspacesLauncherUI/Models/AppLaunching.cs b/src/modules/Workspaces/WorkspacesLauncherUI/Models/AppLaunching.cs index cf4ac4676e..61ad7ae5a7 100644 --- a/src/modules/Workspaces/WorkspacesLauncherUI/Models/AppLaunching.cs +++ b/src/modules/Workspaces/WorkspacesLauncherUI/Models/AppLaunching.cs @@ -3,22 +3,17 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Generic; using System.ComponentModel; using System.Drawing; using System.Drawing.Drawing2D; using System.Drawing.Imaging; using System.IO; using System.Linq; -using System.Text; using System.Text.Json.Serialization; using System.Text.RegularExpressions; -using System.Threading.Tasks; +using System.Windows.Media; using System.Windows.Media.Imaging; -using System.Windows.Navigation; using ManagedCommon; -using Microsoft.VisualBasic.Devices; -using Windows.ApplicationModel; using Windows.Management.Deployment; namespace WorkspacesLauncherUI.Models @@ -74,13 +69,23 @@ namespace WorkspacesLauncherUI.Models public string LaunchState { get; set; } - public string StateImageSource + public string StateGlyph { get => LaunchState switch { - "launched" => "../images/checkmark.png", - "failed" => "../images/failed.png", - _ => "../images/failed.png", + "launched" => "\U0000E73E", + "failed" => "\U0000E711", + _ => "\U0000E711", + }; + } + + public System.Windows.Media.Brush StateColor + { + get => LaunchState switch + { + "launched" => new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 0, 128, 0)), + "failed" => new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 254, 0, 0)), + _ => new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 254, 0, 0)), }; } diff --git a/src/modules/Workspaces/WorkspacesLauncherUI/StatusWindow.xaml b/src/modules/Workspaces/WorkspacesLauncherUI/StatusWindow.xaml index d267d935ef..c8cb1d440a 100644 --- a/src/modules/Workspaces/WorkspacesLauncherUI/StatusWindow.xaml +++ b/src/modules/Workspaces/WorkspacesLauncherUI/StatusWindow.xaml @@ -71,14 +71,17 @@ VerticalAlignment="Center" IsActive="True" Visibility="{Binding Loading, Mode=OneWay, Converter={StaticResource BoolToVis}, UpdateSourceTrigger=PropertyChanged}" /> - diff --git a/src/modules/Workspaces/WorkspacesLauncherUI/WorkspacesLauncherUI.csproj b/src/modules/Workspaces/WorkspacesLauncherUI/WorkspacesLauncherUI.csproj index 81b17f50ec..146716b201 100644 --- a/src/modules/Workspaces/WorkspacesLauncherUI/WorkspacesLauncherUI.csproj +++ b/src/modules/Workspaces/WorkspacesLauncherUI/WorkspacesLauncherUI.csproj @@ -30,9 +30,7 @@ PowerToys.WorkspacesLauncherUI - - @@ -86,15 +84,6 @@ - - - - Always - - - Always - - True diff --git a/src/modules/Workspaces/WorkspacesLauncherUI/images/checkmark.png b/src/modules/Workspaces/WorkspacesLauncherUI/images/checkmark.png deleted file mode 100644 index ae088bf060..0000000000 Binary files a/src/modules/Workspaces/WorkspacesLauncherUI/images/checkmark.png and /dev/null differ diff --git a/src/modules/Workspaces/WorkspacesLauncherUI/images/failed.png b/src/modules/Workspaces/WorkspacesLauncherUI/images/failed.png deleted file mode 100644 index d670f61c05..0000000000 Binary files a/src/modules/Workspaces/WorkspacesLauncherUI/images/failed.png and /dev/null differ