AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename QScreenPrivate::updateHighDpi()

Browse Source 
The function updates the cached QScreen geometry; rename
it to updateGeometry().

Change-Id: I56077807baa6c515769017dbb842eed10b1d1357
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Morten Johan Sørvig 2022-03-11 12:48:54 +01:00 committed by Tor Arne Vestbø
parent a0b34a86b6
commit 5699a1f909
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/kernel/qhighdpiscaling.cpp
View File

@ -532,7 +532,7 @@ void QHighDpiScaling::setGlobalFactor(qreal factor)
m_active = m_globalScalingActive || m_screenFactorSet || m_platformPluginDpiScalingActive ;
const auto screens = QGuiApplication::screens();
for (QScreen *screen : screens)
screen->d_func()->updateHighDpi();
screen->d_func()->updateGeometry();
}
static const char scaleFactorProperty[] = "_q_scaleFactor";

6
src/gui/kernel/qscreen.cpp
View File

@ -48,7 +48,7 @@ void QScreenPrivate::updateGeometriesWithSignals()
{
const QRect oldGeometry = geometry;
const QRect oldAvailableGeometry = availableGeometry;
updateHighDpi();
updateGeometry();
emitGeometryChangeSignals(oldGeometry != geometry, oldAvailableGeometry != availableGeometry);
}
@ -85,11 +85,11 @@ void QScreenPrivate::setPlatformScreen(QPlatformScreen *screen)
if (refreshRate < 1.0)
refreshRate = 60.0;
updateHighDpi();
updateGeometry();
updatePrimaryOrientation(); // derived from the geometry
}
void QScreenPrivate::updateHighDpi()
void QScreenPrivate::updateGeometry()
{
qreal scaleFactor = QHighDpiScaling::factor(platformScreen);
QRect nativeGeometry = platformScreen->geometry();

2
src/gui/kernel/qscreen_p.h
View File

@ -29,7 +29,7 @@ class QScreenPrivate : public QObjectPrivate
Q_DECLARE_PUBLIC(QScreen)
public:
void setPlatformScreen(QPlatformScreen *screen);
void updateHighDpi();
void updateGeometry();
void updatePrimaryOrientation();
void updateGeometriesWithSignals();

2
src/gui/kernel/qwindowsysteminterface.cpp
View File

@ -752,7 +752,7 @@ void QWindowSystemInterface::handleScreenAdded(QPlatformScreen *ps, bool isPrima
QGuiApplicationPrivate::resetCachedDevicePixelRatio();
QHighDpiScaling::updateHighDpiScaling();
screen->d_func()->updateHighDpi();
screen->d_func()->updateGeometry();
emit qGuiApp->screenAdded(screen);