Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move duplicated code to rescale the bitmap to the shared function

Browse Source
This commit is contained in:
Artur Wieczorek
2020-04-10 20:45:34 +02:00
parent f95d6463d3
commit c4f5fd3581
4 changed files with 35 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/propgrid/editors.cpp
View File

@@ -2160,25 +2160,7 @@ void wxPGMultiButton::Add( const wxBitmap& bitmap, int itemid )
if ( bitmap.GetHeight() > hMax )
{
double scale = (double)hMax / bitmap.GetHeight();
int w = wxRound(bitmap.GetWidth()*scale);
int h = wxRound(bitmap.GetHeight()*scale);
#if wxUSE_IMAGE
// Here we use high-quality wxImage scaling functions available
wxImage img = bitmap.ConvertToImage();
img.Rescale(w, h, wxIMAGE_QUALITY_HIGH);
scaledBmp = img;
#else // !wxUSE_IMAGE
scaledBmp.Create(w, h, bitmap.GetDepth());
#if defined(__WXMSW__) || defined(__WXOSX__)
// wxBitmap::UseAlpha() is used only on wxMSW and wxOSX.
scaledBmp.UseAlpha(bitmap.HasAlpha());
#endif // __WXMSW__ || __WXOSX__
{
wxMemoryDC dc(scaledBmp);
dc.SetUserScale(scale, scale);
dc.DrawBitmap(bitmap, 0, 0);
}
#endif // wxUSE_IMAGE/!wxUSE_IMAGE
scaledBmp = wxPropertyGrid::RescaleBitmap(bitmap, scale, scale);
}
else
{