Make wxWindow::GetContentScaleFactor() return 1 under MSW again
This reverts bc492a9e6e (Make wxWindow::GetContentScaleFactor() useful
for non-OSX platforms., 2015-03-18) and restores the old behaviour from
wxWidgets 3.0, which consisted in only returning factor different from 1
from this function for the platforms distinguishing logical and physical
pixels.
After this change, the return value of this function can be portably
used on all platforms to convert between logical and physical pixels,
independently of the current DPI.
This commit is contained in:
@@ -12687,11 +12687,8 @@ bool wxRichTextImage::LoadAndScaleImageCache(wxImage& image, const wxSize& sz, w
|
||||
else
|
||||
{
|
||||
double scaleFactor = 1.0;
|
||||
// Scaled bitmaps only work on Mac currently
|
||||
#ifdef __WXOSX_COCOA__
|
||||
if (context.GetBuffer() && context.GetBuffer()->GetRichTextCtrl())
|
||||
scaleFactor = context.GetBuffer()->GetRichTextCtrl()->GetContentScaleFactor();
|
||||
#endif
|
||||
|
||||
// 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
|
||||
|
||||
Reference in New Issue
Block a user