Don't scale 16x15 to 16x16 - fixes corruption of bookmark icons in help window

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2012-03-13 17:23:58 +00:00
parent 374ce55dca
commit 67d3242ada

View File

@@ -219,7 +219,12 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
int bmp_w = bmp.GetWidth();
int bmp_h = bmp.GetHeight();
if ((bmp_h < bestSize.x) && (bmp_w < bestSize.y))
if (bmp_w == 16 && bmp_h == 15 && bestSize == wxSize(16, 16))
{
// Do nothing in this special but quite common case, because scaling
// with only a pixel difference will look horrible.
}
else if ((bmp_h < bestSize.x) && (bmp_w < bestSize.y))
{
// the caller wants default size, which is larger than
// the image we have; to avoid degrading it visually by