From: Václav Slavík <vslavik@fastmail.fm>
Date: Sun, 16 Mar 2008 00:37:17 +0000 (+0000)
Subject: Fixed generic art provider to scale bitmaps down to client-specific best size if... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e6e780acb18d42861eae6572ff22361a310d92f3?ds=inline

Fixed generic art provider to scale bitmaps down to client-specific best size if needed.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index e7e113c851..9dab2e5878 100644
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -232,14 +232,26 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
             {
                 int bmp_w = bmp.GetWidth();
                 int bmp_h = bmp.GetHeight();
-                // want default size but it's smaller, paste into transparent image
+
                 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
+                    // scaling it up, paste it into transparent image instead:
                     wxPoint offset((bestSize.x - bmp_w)/2, (bestSize.y - bmp_h)/2);
                     wxImage img = bmp.ConvertToImage();
                     img.Resize(bestSize, offset);
                     bmp = wxBitmap(img);
                 }
+                else // scale (down or mixed, but not up)
+                {
+                    wxImage img = bmp.ConvertToImage();
+                    bmp = wxBitmap
+                          (
+                              img.Scale(bestSize.x, bestSize.y,
+                                        wxIMAGE_QUALITY_HIGH)
+                          );
+                }
             }
         }
     }