From 2a2c53e7f3d7b9ad7074999538a4a83aa72b3ca9 Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Wed, 29 Jan 2025 06:54:17 -0600 Subject: [PATCH] Tiny nits for winget --- .../Microsoft.CmdPal.UI.ViewModels/ProgressViewModel.cs | 3 --- src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml | 2 +- .../Pages/InstallPackageCommand.cs | 4 +++- .../Pages/InstallPackageListItem.cs | 5 ++--- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ProgressViewModel.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ProgressViewModel.cs index cf0a31da681f..e0c012d1220f 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ProgressViewModel.cs +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ProgressViewModel.cs @@ -15,8 +15,6 @@ public partial class ProgressViewModel : ExtensionObjectViewModel public uint ProgressPercent { get; private set; } - public double ProgressValue => ProgressPercent / 100.0; - public ProgressViewModel(IProgressState progress, IPageContext context) : base(context) { @@ -64,7 +62,6 @@ protected virtual void FetchProperty(string propertyName) break; case nameof(ProgressPercent): this.ProgressPercent = model.ProgressPercent; - UpdateProperty(nameof(ProgressValue)); break; } diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml index 349d81f00215..dd389ea9dd41 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml @@ -329,7 +329,7 @@ Margin="0,-20,0,0" IsIndeterminate="{x:Bind ViewModel.CurrentPage.MostRecentStatusMessage.Progress.IsIndeterminate, Mode=OneWay}" Visibility="{x:Bind ViewModel.CurrentPage.MostRecentStatusMessage.HasProgress, Mode=OneWay}" - Value="{x:Bind ViewModel.CurrentPage.MostRecentStatusMessage.Progress.ProgressValue, Mode=OneWay}" /> + Value="{x:Bind ViewModel.CurrentPage.MostRecentStatusMessage.Progress.ProgressPercent, Mode=OneWay}" /> diff --git a/src/modules/cmdpal/exts/Microsoft.CmdPal.Ext.WinGet/Pages/InstallPackageCommand.cs b/src/modules/cmdpal/exts/Microsoft.CmdPal.Ext.WinGet/Pages/InstallPackageCommand.cs index 9a82286f1b0f..7db553f88b7a 100644 --- a/src/modules/cmdpal/exts/Microsoft.CmdPal.Ext.WinGet/Pages/InstallPackageCommand.cs +++ b/src/modules/cmdpal/exts/Microsoft.CmdPal.Ext.WinGet/Pages/InstallPackageCommand.cs @@ -153,7 +153,9 @@ private void OnInstallProgress( { downloadText += $"{FormatBytes(progress.BytesDownloaded)} of {FormatBytes(progress.BytesRequired)}"; _installBanner.Progress ??= new ProgressState() { IsIndeterminate = false }; - ((ProgressState)_installBanner.Progress).ProgressPercent = (uint)(progress.BytesDownloaded / progress.BytesRequired * 100); + var downloaded = (float)progress.BytesDownloaded / (float)progress.BytesRequired; + var percent = downloaded * 100.0f; + ((ProgressState)_installBanner.Progress).ProgressPercent = (uint)percent; _installBanner.Message = downloadText; } diff --git a/src/modules/cmdpal/exts/Microsoft.CmdPal.Ext.WinGet/Pages/InstallPackageListItem.cs b/src/modules/cmdpal/exts/Microsoft.CmdPal.Ext.WinGet/Pages/InstallPackageListItem.cs index 8da768d45e84..39fec0183ae8 100644 --- a/src/modules/cmdpal/exts/Microsoft.CmdPal.Ext.WinGet/Pages/InstallPackageListItem.cs +++ b/src/modules/cmdpal/exts/Microsoft.CmdPal.Ext.WinGet/Pages/InstallPackageListItem.cs @@ -37,9 +37,8 @@ public InstallPackageListItem(CatalogPackage package) { var description = string.IsNullOrEmpty(metadata.Description) ? metadata.ShortDescription : metadata.Description; var detailsBody = $""" -## {metadata.Publisher} -{metadata.Description} +{description} """; IconInfo heroIcon = new(string.Empty); var icons = metadata.Icons; @@ -64,7 +63,7 @@ public InstallPackageListItem(CatalogPackage package) private List GetDetailsMetadata(CatalogPackageMetadata metadata) { - List detailsElements = new(); + List detailsElements = []; // key -> {text, url} Dictionary simpleData = new()