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

Preserve original image in wxImageFileProperty

Browse Source 
Rescale only the copy of the original image to preserve image quality.
This commit is contained in:
Artur Wieczorek
2022-04-10 13:34:03 +02:00
parent 6c7cf8e6d0
commit 04bad7a720
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/propgrid/advprops.h
View File

@@ -297,7 +297,7 @@ public:
protected: protected:
wxBitmap m_bitmap; // final thumbnail area wxBitmap m_bitmap; // final thumbnail area
wxImage m_image; // intermediate thumbnail area wxImage m_image; // original thumbnail area
private: private:
// Initialize m_image using the current file name. // Initialize m_image using the current file name.

2
interface/wx/propgrid/advprops.h
View File

@@ -251,7 +251,7 @@ public:
protected: protected:
wxBitmap m_bitmap; // final thumbnail area wxBitmap m_bitmap; // final thumbnail area
wxImage m_image; // intermediate thumbnail area wxImage m_image; // original thumbnail area
}; };

12
src/propgrid/advprops.cpp
View File

@@ -1876,7 +1876,7 @@ void wxImageFileProperty::OnCustomPaint( wxDC& dc,
const wxRect& rect, const wxRect& rect,
wxPGPaintData& ) wxPGPaintData& )
{ {
if ( m_bitmap.IsOk() || m_image.IsOk() ) if ( m_image.IsOk() )
{ {
// Draw the thumbnail // Draw the thumbnail
// Create the bitmap here because required size is not known in OnSetValue(). // Create the bitmap here because required size is not known in OnSetValue().
@@ -1889,11 +1889,15 @@ void wxImageFileProperty::OnCustomPaint( wxDC& dc,
if ( !m_bitmap.IsOk() ) if ( !m_bitmap.IsOk() )
{ {
m_image.Rescale( rect.width, rect.height ); wxImage imgScaled = m_image;
m_bitmap = wxBitmap(m_image, dc); imgScaled.Rescale(rect.width, rect.height);
m_bitmap = wxBitmap(imgScaled, dc);
}
} }
dc.DrawBitmap( m_bitmap, rect.x, rect.y, false ); if ( m_bitmap.IsOk() )
{
dc.DrawBitmap(m_bitmap, rect.x, rect.y, false);
} }
else else
{ {