diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Resources.Designer.cs b/src/NuGet.Clients/NuGet.PackageManagement.UI/Resources.Designer.cs index 91de9332486..8fa9cabf1cf 100644 --- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Resources.Designer.cs +++ b/src/NuGet.Clients/NuGet.PackageManagement.UI/Resources.Designer.cs @@ -2042,6 +2042,15 @@ public static string Text_Loading { } } + /// + /// Looks up a localized string similar to Loading README.... + /// + public static string Text_LoadingReadme { + get { + return ResourceManager.GetString("Text_LoadingReadme", resourceCulture); + } + } + /// /// Looks up a localized string similar to You can manage these settings in . /// @@ -2235,6 +2244,15 @@ public static string Text_PackageSources { } } + /// + /// Looks up a localized string similar to README loaded. + /// + public static string Text_ReadmeLoaded { + get { + return ResourceManager.GetString("Text_ReadmeLoaded", resourceCulture); + } + } + /// /// Looks up a localized string similar to Search ({0}). /// diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Resources.resx b/src/NuGet.Clients/NuGet.PackageManagement.UI/Resources.resx index 8a22fe0aebb..7005972eb0e 100644 --- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Resources.resx +++ b/src/NuGet.Clients/NuGet.PackageManagement.UI/Resources.resx @@ -279,6 +279,12 @@ Loading... + + Loading README... + + + README loaded + No packages found @@ -1093,4 +1099,4 @@ Only the package maintainer can add a README. If you are not the maintainer, ple For instructions on how to add a README, please visit [aka.ms/nuget/readme](https://aka.ms/nuget/readme) {Locked="[aka.ms/nuget/readme](https://aka.ms/nuget/readme)"} "[aka.ms/nuget/readme](https://aka.ms/nuget/readme)" this is a URL link and should not be translated - \ No newline at end of file + diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageReadmeControl.xaml b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageReadmeControl.xaml index 7ac5326c491..bd9150b3b04 100644 --- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageReadmeControl.xaml +++ b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageReadmeControl.xaml @@ -9,6 +9,7 @@ xmlns:imagingTheme="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Imaging" xmlns:catalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog" xmlns:ui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Utilities" + xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0" Background="{DynamicResource {x:Static nuget:Brushes.DetailPaneBackground}}" Foreground="{DynamicResource {x:Static nuget:Brushes.UIText}}" DataContextChanged="UserControl_DataContextChanged" @@ -31,10 +32,46 @@ ClipToBounds="True" Focusable="False" Visibility="{Binding Path=IsReadmeReady, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" /> - + + + + + + + + + + + + + + (ReadmePreviewViewModel)DataContext; } @@ -71,6 +70,7 @@ private async Task UpdateMarkdownAsync() { try { + descriptionMarkdownPreview.Content = descriptionMarkdownPreview.Content ?? _markdownPreview.VisualElement; if (!string.IsNullOrWhiteSpace(ReadmeViewModel.ReadmeMarkdown)) { await _markdownPreview.UpdateContentAsync(ReadmeViewModel.ReadmeMarkdown, ScrollHint.None);