Skip to content

always create a 32x32 image, even if application.current is null #3725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rrelyea merged 3 commits into from
Oct 22, 2020
Merged

always create a 32x32 image, even if application.current is null #3725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c2ddef
always create a 32x32 image, even if application.current is null
Oct 21, 2020
a40ebc0
remove unused namespace
Oct 21, 2020
e8765b8
whitespace fix
Oct 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions src/NuGet.Clients/NuGet.PackageManagement.UI/Resources/Images.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System;
using System.Collections.Generic;
using System.Windows;
using System.Windows.Media;
using System.Windows.Media.Imaging;
Expand Down Expand Up @@ -31,17 +32,28 @@ static Images()
image.Freeze();
DefaultPackageIcon = image;
}
else // for tests, don't actually load the icon, just use a 1x1 image.
else // for tests, don't actually load the icon, just use a 32x32 image.
{
const int size = PackageItemListViewModel.DecodePixelWidth;
var bytes = new List<byte>();
byte[] pixel = new byte[] { 0, 0, 255, 0 };
for (int y = 0; y < size; y++)
{
for (int x = 0; x < size; x++)
{
bytes.AddRange(pixel);
}
}

BitmapSource image = BitmapSource.Create(
pixelWidth: 1,
pixelHeight: 1,
pixelWidth: size,
pixelHeight: size,
dpiX: 96.0,
dpiY: 96.0,
PixelFormats.Bgr32,
palette: null,
pixels: new byte[] { 0, 0, 255, 0 },
stride: 32);
pixels: bytes.ToArray(),
stride: 4 * size);
image.Freeze();
DefaultPackageIcon = image;
}
Expand Down
7 changes: 2 additions & 5 deletions ...Get.Clients.Tests/NuGet.PackageManagement.UI.Test/Models/PackageItemListViewModelTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,11 +379,8 @@ private static void VerifyImageResult(object result, IconBitmapStatus bitmapStat
Assert.True(result is BitmapImage || result is CachedBitmap);
var image = result as BitmapSource;
Assert.NotNull(image);
int expectedSize = IconBitmapStatusUtility.GetIsDefaultIcon(bitmapStatus)
? 1
: PackageItemListViewModel.DecodePixelWidth;
Assert.Equal(expectedSize, image.PixelWidth);
Assert.Equal(expectedSize, image.PixelHeight);
Assert.Equal(PackageItemListViewModel.DecodePixelWidth, image.PixelWidth);
Assert.Equal(PackageItemListViewModel.DecodePixelWidth, image.PixelHeight);
}

/// <summary>
Expand Down