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

use common contentScaleFactor also for DPI on macOS

Browse Source 
and give a reasonable default for missing tlw
This commit is contained in:
Stefan Csomor
2020-08-14 15:52:48 +02:00
committed by Vadim Zeitlin
parent c346fd0321
commit 08a63c3b49
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/osx/cocoa/window.mm
View File

@@ -2648,7 +2648,10 @@ void wxWidgetCocoaImpl::SetVisibility( bool visible )
double wxWidgetCocoaImpl::GetContentScaleFactor() const double wxWidgetCocoaImpl::GetContentScaleFactor() const
{ {
NSWindow* tlw = [m_osxView window]; NSWindow* tlw = [m_osxView window];
return [tlw backingScaleFactor]; if ( tlw )
return [tlw backingScaleFactor];
else
return wxOSXGetMainScreenContentScaleFactor();
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

8
src/osx/window_osx.cpp
View File

@@ -2636,13 +2636,7 @@ wxSize wxWindowMac::GetDPI() const
// on mac ContentScale and DPIScale are identical // on mac ContentScale and DPIScale are identical
double wxWindowMac::GetDPIScaleFactor() const double wxWindowMac::GetDPIScaleFactor() const
{ {
double scaleFactor; return GetContentScaleFactor();
if ( wxNonOwnedWindow* tlw = MacGetTopLevelWindow() )
scaleFactor = tlw->GetContentScaleFactor();
else
scaleFactor = wxOSXGetMainScreenContentScaleFactor();
return scaleFactor;
} }