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

Only use scaled content factor for bitmaps on Mac

Browse Source
This commit is contained in:
JulianSmart
2015-11-15 18:54:10 +00:00
parent a797c9d956
commit 76190de960
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/propgrid/propgrid.cpp
View File

@@ -4660,7 +4660,12 @@ void wxPropertyGrid::OnResize( wxSizeEvent& event )
if ( !HasExtraStyle(wxPG_EX_NATIVE_DOUBLE_BUFFERING) ) if ( !HasExtraStyle(wxPG_EX_NATIVE_DOUBLE_BUFFERING) )
{ {
// Scaled bitmaps only work on Mac currently
#ifdef __WXOSX_COCOA__
double scaleFactor = GetContentScaleFactor(); double scaleFactor = GetContentScaleFactor();
#else
double scaleFactor = 1.0;
#endif
int dblh = (m_lineHeight*2); int dblh = (m_lineHeight*2);
if ( !m_doubleBuffer ) if ( !m_doubleBuffer )
{ {

3
src/richtext/richtextbuffer.cpp
View File

@@ -12681,8 +12681,11 @@ bool wxRichTextImage::LoadAndScaleImageCache(wxImage& image, const wxSize& sz, w
else else
{ {
double scaleFactor = 1.0; double scaleFactor = 1.0;
// Scaled bitmaps only work on Mac currently
#ifdef __WXOSX_COCOA__
if (context.GetBuffer() && context.GetBuffer()->GetRichTextCtrl()) if (context.GetBuffer() && context.GetBuffer()->GetRichTextCtrl())
scaleFactor = context.GetBuffer()->GetRichTextCtrl()->GetContentScaleFactor(); scaleFactor = context.GetBuffer()->GetRichTextCtrl()->GetContentScaleFactor();
#endif
// If the original width and height is small, e.g. 400 or below, // If the original width and height is small, e.g. 400 or below,
// scale up and then down to improve image quality. This can make // scale up and then down to improve image quality. This can make