1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: Remove code for handling logical DPI changes

Browse Source 
The logical (base) DPI is always 72 on macOS.

Pick-to: 6.3
Change-Id: Ibf9894fdc78d2af2d9949b29dd19ae9e8f2201c7
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Tor Arne Vestbø 2022-03-01 11:31:22 +01:00
parent 423b650938
commit 745893997a
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/cocoa/qcocoascreen.h
View File

@ -70,8 +70,7 @@ public:
QColorSpace colorSpace() const override { return m_colorSpace; } QColorSpace colorSpace() const override { return m_colorSpace; }
qreal devicePixelRatio() const override { return m_devicePixelRatio; } qreal devicePixelRatio() const override { return m_devicePixelRatio; }
QSizeF physicalSize() const override { return m_physicalSize; } QSizeF physicalSize() const override { return m_physicalSize; }
QDpi logicalDpi() const override { return m_logicalDpi; } QDpi logicalBaseDpi() const override { return QDpi(72, 72); }
QDpi logicalBaseDpi() const override { return m_logicalDpi; }
qreal refreshRate() const override { return m_refreshRate; } qreal refreshRate() const override { return m_refreshRate; }
QString name() const override { return m_name; } QString name() const override { return m_name; }
QPlatformCursor *cursor() const override { return m_cursor; } QPlatformCursor *cursor() const override { return m_cursor; }
@ -119,7 +118,6 @@ private:
QRect m_geometry; QRect m_geometry;
QRect m_availableGeometry; QRect m_availableGeometry;
QDpi m_logicalDpi;
qreal m_refreshRate = 0; qreal m_refreshRate = 0;
int m_depth = 0; int m_depth = 0;
QString m_name; QString m_name;

5
src/plugins/platforms/cocoa/qcocoascreen.mm
View File

@ -269,7 +269,6 @@ void QCocoaScreen::update(CGDirectDisplayID displayId)
const QRect previousGeometry = m_geometry; const QRect previousGeometry = m_geometry;
const QRect previousAvailableGeometry = m_availableGeometry; const QRect previousAvailableGeometry = m_availableGeometry;
const QDpi previousLogicalDpi = m_logicalDpi;
const qreal previousRefreshRate = m_refreshRate; const qreal previousRefreshRate = m_refreshRate;
// The reference screen for the geometry is always the primary screen // The reference screen for the geometry is always the primary screen
@ -289,8 +288,6 @@ void QCocoaScreen::update(CGDirectDisplayID displayId)
CGSize size = CGDisplayScreenSize(m_displayId); CGSize size = CGDisplayScreenSize(m_displayId);
m_physicalSize = QSizeF(size.width, size.height); m_physicalSize = QSizeF(size.width, size.height);
m_logicalDpi.first = 72;
m_logicalDpi.second = 72;
QCFType<CGDisplayModeRef> displayMode = CGDisplayCopyDisplayMode(m_displayId); QCFType<CGDisplayModeRef> displayMode = CGDisplayCopyDisplayMode(m_displayId);
float refresh = CGDisplayModeGetRefreshRate(displayMode); float refresh = CGDisplayModeGetRefreshRate(displayMode);
@ -302,8 +299,6 @@ void QCocoaScreen::update(CGDirectDisplayID displayId)
if (didChangeGeometry) if (didChangeGeometry)
QWindowSystemInterface::handleScreenGeometryChange(screen(), geometry(), availableGeometry()); QWindowSystemInterface::handleScreenGeometryChange(screen(), geometry(), availableGeometry());
if (m_logicalDpi != previousLogicalDpi)
QWindowSystemInterface::handleScreenLogicalDotsPerInchChange(screen(), m_logicalDpi.first, m_logicalDpi.second);
if (m_refreshRate != previousRefreshRate) if (m_refreshRate != previousRefreshRate)
QWindowSystemInterface::handleScreenRefreshRateChange(screen(), m_refreshRate); QWindowSystemInterface::handleScreenRefreshRateChange(screen(), m_refreshRate);
} }