summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gui/kernel/qcursor.cpp4
-rw-r--r--src/gui/kernel/qguiapplication.cpp2
-rw-r--r--src/gui/kernel/qhighdpiscaling.cpp6
-rw-r--r--src/gui/kernel/qhighdpiscaling_p.h66
-rw-r--r--src/gui/kernel/qplatformscreen.cpp8
-rw-r--r--src/gui/kernel/qplatformwindow.cpp10
-rw-r--r--src/gui/kernel/qscreen_p.h8
-rw-r--r--src/gui/kernel/qwindow.cpp14
-rw-r--r--src/gui/kernel/qwindowsysteminterface.cpp38
-rw-r--r--src/gui/painting/qbackingstore.cpp8
-rw-r--r--src/plugins/platforms/xcb/qxcbbackingstore.cpp10
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.cpp4
12 files changed, 91 insertions, 87 deletions
diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp
index 547c32b2b4..dc1b6dca76 100644
--- a/src/gui/kernel/qcursor.cpp
+++ b/src/gui/kernel/qcursor.cpp
@@ -180,7 +180,7 @@ QPoint QCursor::pos(const QScreen *screen)
{
if (screen)
if (const QPlatformCursor *cursor = screen->handle()->cursor())
- return qHighDpiToDeviceIndependentPixels(cursor->pos());
+ return QHighDpi::fromDevicePixels(cursor->pos());
return QGuiApplicationPrivate::lastCursorPosition.toPoint();
}
@@ -232,7 +232,7 @@ void QCursor::setPos(QScreen *screen, int x, int y)
{
if (screen) {
if (QPlatformCursor *cursor = screen->handle()->cursor()) {
- const QPoint devicePos = qHighDpiToDevicePixels(QPoint(x, y));
+ const QPoint devicePos = QHighDpi::toDevicePixels(QPoint(x, y));
// Need to check, since some X servers generate null mouse move
// events, causing looping in applications which call setPos() on
// every mouse move event.
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 16db3e66da..5ef5ec2115 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -957,7 +957,7 @@ QWindow *QGuiApplication::topLevelAt(const QPoint &pos)
QList<QScreen *>::const_iterator screen = screens.constBegin();
QList<QScreen *>::const_iterator end = screens.constEnd();
- const QPoint devicePosition = qHighDpiToDevicePixels(pos);
+ const QPoint devicePosition = QHighDpi::toDevicePixels(pos);
while (screen != end) {
if ((*screen)->geometry().contains(pos))
return (*screen)->handle()->topLevelAt(devicePosition);
diff --git a/src/gui/kernel/qhighdpiscaling.cpp b/src/gui/kernel/qhighdpiscaling.cpp
index f4490dccae..eeeb995d43 100644
--- a/src/gui/kernel/qhighdpiscaling.cpp
+++ b/src/gui/kernel/qhighdpiscaling.cpp
@@ -112,14 +112,14 @@ qreal QHighDpiScaling::factor(const QWindow *window)
return m_factor * (windowFactor.isValid() ? windowFactor.toReal() : 1);
}
-Q_GUI_EXPORT QSize qHighDpiToDevicePixelsConstrained(const QSize &size, const QWindow *window)
+Q_GUI_EXPORT QSize QHighDpi::toDevicePixelsConstrained(const QSize &size, const QWindow *window)
{
const int width = size.width();
const int height = size.height();
return QSize(width > 0 && width < QWINDOWSIZE_MAX ?
- qHighDpiToDevicePixels(width, window) : width,
+ QHighDpi::toDevicePixels(width, window) : width,
height > 0 && height < QWINDOWSIZE_MAX ?
- qHighDpiToDevicePixels(height, window) : height);
+ QHighDpi::toDevicePixels(height, window) : height);
}
QT_END_NAMESPACE
diff --git a/src/gui/kernel/qhighdpiscaling_p.h b/src/gui/kernel/qhighdpiscaling_p.h
index 8b10311c69..6929b3ac83 100644
--- a/src/gui/kernel/qhighdpiscaling_p.h
+++ b/src/gui/kernel/qhighdpiscaling_p.h
@@ -89,114 +89,117 @@ private:
};
// Coordinate system conversion functions:
-// qHighDpiToDeviceIndependentPixels : from physical(screen/backing) to logical pixels
-// qHighDpiToDevicePixels : from logical to physical pixels
-inline QRect qHighDpiToDeviceIndependentPixels(const QRect &pixelRect, const QWindow *window = 0)
+// QHighDpi::fromDevicePixels : from physical(screen/backing) to logical pixels
+// QHighDpi::toDevicePixels : from logical to physical pixels
+
+namespace QHighDpi {
+
+inline QRect fromDevicePixels(const QRect &pixelRect, const QWindow *window = 0)
{
const qreal scaleFactor = QHighDpiScaling::factor(window);
return QRect(pixelRect.topLeft() / scaleFactor, pixelRect.size() / scaleFactor);
}
-inline QRect qHighDpiToDevicePixels(const QRect &pointRect, const QWindow *window = 0)
+inline QRect toDevicePixels(const QRect &pointRect, const QWindow *window = 0)
{
const qreal scaleFactor = QHighDpiScaling::factor(window);
return QRect(pointRect.topLeft() * scaleFactor, pointRect.size() * scaleFactor);
}
-inline QRectF qHighDpiToDeviceIndependentPixels(const QRectF &pixelRect, const QWindow *window = 0)
+inline QRectF fromDevicePixels(const QRectF &pixelRect, const QWindow *window = 0)
{
const qreal scaleFactor = QHighDpiScaling::factor(window);
return QRectF(pixelRect.topLeft() / scaleFactor, pixelRect.size() / scaleFactor);
}
-inline QRectF qHighDpiToDevicePixels(const QRectF &pointRect, const QWindow *window = 0)
+inline QRectF toDevicePixels(const QRectF &pointRect, const QWindow *window = 0)
{
const qreal scaleFactor = QHighDpiScaling::factor(window);
return QRectF(pointRect.topLeft() * scaleFactor, pointRect.size() * scaleFactor);
}
-inline QSize qHighDpiToDeviceIndependentPixels(const QSize &pixelSize, const QWindow *window = 0)
+inline QSize fromDevicePixels(const QSize &pixelSize, const QWindow *window = 0)
{
return pixelSize / QHighDpiScaling::factor(window);
}
// For converting minimum/maximum sizes of QWindow, limits to 0..QWINDOWSIZE_MAX
-Q_GUI_EXPORT QSize qHighDpiToDevicePixelsConstrained(const QSize &size, const QWindow *window = 0);
+Q_GUI_EXPORT QSize toDevicePixelsConstrained(const QSize &size, const QWindow *window = 0);
-inline QSize qHighDpiToDevicePixels(const QSize &pointSize, const QWindow *window = 0)
+inline QSize toDevicePixels(const QSize &pointSize, const QWindow *window = 0)
{
return pointSize * QHighDpiScaling::factor(window);
}
-inline QSizeF qHighDpiToDeviceIndependentPixels(const QSizeF &pixelSize, const QWindow *window = 0)
+inline QSizeF fromDevicePixels(const QSizeF &pixelSize, const QWindow *window = 0)
{
return pixelSize / QHighDpiScaling::factor(window);
}
-inline QSizeF qHighDpiToDevicePixels(const QSizeF &pointSize, const QWindow *window = 0)
+inline QSizeF toDevicePixels(const QSizeF &pointSize, const QWindow *window = 0)
{
return pointSize * QHighDpiScaling::factor(window);
}
-inline QPoint qHighDpiToDeviceIndependentPixels(const QPoint &pixelPoint, const QWindow *window = 0)
+inline QPoint fromDevicePixels(const QPoint &pixelPoint, const QWindow *window = 0)
{
return pixelPoint / QHighDpiScaling::factor(window);
}
-inline QPoint qHighDpiToDevicePixels(const QPoint &pointPoint, const QWindow *window = 0)
+inline QPoint toDevicePixels(const QPoint &pointPoint, const QWindow *window = 0)
{
return pointPoint * QHighDpiScaling::factor(window);
}
-inline QPointF qHighDpiToDeviceIndependentPixels(const QPointF &pixelPoint, const QWindow *window = 0)
+inline QPointF fromDevicePixels(const QPointF &pixelPoint, const QWindow *window = 0)
{
return pixelPoint / QHighDpiScaling::factor(window);
}
-inline QPointF qHighDpiToDevicePixels(const QPointF &pointPoint, const QWindow *window = 0)
+inline QPointF toDevicePixels(const QPointF &pointPoint, const QWindow *window = 0)
{
return pointPoint * QHighDpiScaling::factor(window);
}
-inline QMargins qHighDpiToDeviceIndependentPixels(const QMargins &pixelMargins, const QWindow *window = 0)
+inline QMargins fromDevicePixels(const QMargins &pixelMargins, const QWindow *window = 0)
{
const qreal scaleFactor = QHighDpiScaling::factor(window);
return QMargins(pixelMargins.left() / scaleFactor, pixelMargins.top() / scaleFactor,
pixelMargins.right() / scaleFactor, pixelMargins.bottom() / scaleFactor);
}
-inline QMargins qHighDpiToDevicePixels(const QMargins &pointMargins, const QWindow *window = 0)
+inline QMargins toDevicePixels(const QMargins &pointMargins, const QWindow *window = 0)
{
const qreal scaleFactor = QHighDpiScaling::factor(window);
return QMargins(pointMargins.left() * scaleFactor, pointMargins.top() * scaleFactor,
pointMargins.right() * scaleFactor, pointMargins.bottom() * scaleFactor);
}
-inline QRegion qHighDpiToDeviceIndependentPixels(const QRegion &pixelRegion, const QWindow *window = 0)
+inline QRegion fromDevicePixels(const QRegion &pixelRegion, const QWindow *window = 0)
{
if (!QHighDpiScaling::isActive())
return pixelRegion;
QRegion pointRegion;
foreach (const QRect &rect, pixelRegion.rects())
- pointRegion += qHighDpiToDeviceIndependentPixels(rect, window);
+ pointRegion += fromDevicePixels(rect, window);
return pointRegion;
}
-inline QRegion qHighDpiToDevicePixels(const QRegion &pointRegion, const QWindow *window = 0)
+inline QRegion toDevicePixels(const QRegion &pointRegion, const QWindow *window = 0)
{
if (!QHighDpiScaling::isActive())
return pointRegion;
QRegion pixelRegon;
foreach (const QRect &rect, pointRegion.rects())
- pixelRegon += qHighDpiToDevicePixels(rect, window);
+ pixelRegon += toDevicePixels(rect, window);
return pixelRegon;
}
// Any T that has operator/()
template <typename T>
-T qHighDpiToDeviceIndependentPixels(const T &pixelValue, const QWindow *window = 0)
+T fromDevicePixels(const T &pixelValue, const QWindow *window = 0)
{
if (!QHighDpiScaling::isActive())
return pixelValue;
@@ -207,7 +210,7 @@ T qHighDpiToDeviceIndependentPixels(const T &pixelValue, const QWindow *window =
// Any T that has operator*()
template <typename T>
-T qHighDpiToDevicePixels(const T &pointValue, const QWindow *window = 0)
+T toDevicePixels(const T &pointValue, const QWindow *window = 0)
{
if (!QHighDpiScaling::isActive())
return pointValue;
@@ -217,7 +220,7 @@ T qHighDpiToDevicePixels(const T &pointValue, const QWindow *window = 0)
// Any QVector<T> where T has operator/()
template <typename T>
-QVector<T> qHighDpiToDeviceIndependentPixels(const QVector<T> &pixelValues, const QWindow *window = 0)
+QVector<T> fromDevicePixels(const QVector<T> &pixelValues, const QWindow *window = 0)
{
if (!QHighDpiScaling::isActive())
return pixelValues;
@@ -230,7 +233,7 @@ QVector<T> qHighDpiToDeviceIndependentPixels(const QVector<T> &pixelValues, cons
// Any QVector<T> where T has operator*()
template <typename T>
-QVector<T> qHighDpiToDevicePixels(const QVector<T> &pointValues, const QWindow *window = 0)
+QVector<T> toDevicePixels(const QVector<T> &pointValues, const QWindow *window = 0)
{
if (!QHighDpiScaling::isActive())
return pointValues;
@@ -244,18 +247,19 @@ QVector<T> qHighDpiToDevicePixels(const QVector<T> &pointValues, const QWindow *
// Any QPair<T, U> where T and U has operator/()
template <typename T, typename U>
-QPair<T, U> qHighDpiToDeviceIndependentPixels(const QPair<T, U> &pixelPair, const QWindow *window = 0)
+QPair<T, U> fromDevicePixels(const QPair<T, U> &pixelPair, const QWindow *window = 0)
{
- return qMakePair(qHighDpiToDeviceIndependentPixels(pixelPair.first, window),
- qHighDpiToDeviceIndependentPixels(pixelPair.second, window));
+ return qMakePair(fromDevicePixels(pixelPair.first, window),
+ fromDevicePixels(pixelPair.second, window));
}
// Any QPair<T, U> where T and U has operator*()
template <typename T, typename U>
-QPair<T, U> qHighDpiToDevicePixels(const QPair<T, U> &pointPair, const QWindow *window = 0)
+QPair<T, U> toDevicePixels(const QPair<T, U> &pointPair, const QWindow *window = 0)
{
- return qMakePair(qHighDpiToDevicePixels(pointPair.first, window),
- qHighDpiToDevicePixels(pointPair.second, window));
+ return qMakePair(QHighDpi::toDevicePixels(pointPair.first, window),
+ QHighDpi::toDevicePixels(pointPair.second, window));
+}
}
QT_END_NAMESPACE
diff --git a/src/gui/kernel/qplatformscreen.cpp b/src/gui/kernel/qplatformscreen.cpp
index 1e14818c30..e2c84fbc2c 100644
--- a/src/gui/kernel/qplatformscreen.cpp
+++ b/src/gui/kernel/qplatformscreen.cpp
@@ -291,8 +291,8 @@ void QPlatformScreen::resizeMaximizedWindows()
// 'screen()' still has the old geometry info while 'this' has the new geometry info
const QRect oldGeometry = screen()->geometry();
const QRect oldAvailableGeometry = screen()->availableGeometry();
- const QRect newGeometry = qHighDpiToDeviceIndependentPixels(geometry());
- const QRect newAvailableGeometry = qHighDpiToDeviceIndependentPixels(availableGeometry());
+ const QRect newGeometry = QHighDpi::fromDevicePixels(geometry());
+ const QRect newAvailableGeometry = QHighDpi::fromDevicePixels(availableGeometry());
// make sure maximized and fullscreen windows are updated
for (int i = 0; i < windows.size(); ++i) {
@@ -396,12 +396,12 @@ QRect QPlatformScreen::mapBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation
QRect QPlatformScreen::screenGeometry() const
{
- return qHighDpiToDevicePixels(screen()->geometry());
+ return QHighDpi::toDevicePixels(screen()->geometry());
}
QRect QPlatformScreen::screenAvailableGeometry() const
{
- return qHighDpiToDevicePixels(screen()->availableGeometry());
+ return QHighDpi::toDevicePixels(screen()->availableGeometry());
}
/*!
diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp
index 4ac855d9e5..7b9eadbe17 100644
--- a/src/gui/kernel/qplatformwindow.cpp
+++ b/src/gui/kernel/qplatformwindow.cpp
@@ -633,7 +633,7 @@ void QPlatformWindow::requestUpdate()
*/
QSize QPlatformWindow::windowMinimumSize() const
{
- return qHighDpiToDevicePixelsConstrained(window()->minimumSize(), window());
+ return QHighDpi::toDevicePixelsConstrained(window()->minimumSize(), window());
}
/*!
@@ -641,7 +641,7 @@ QSize QPlatformWindow::windowMinimumSize() const
*/
QSize QPlatformWindow::windowMaximumSize() const
{
- return qHighDpiToDevicePixelsConstrained(window()->maximumSize(), window());
+ return QHighDpi::toDevicePixelsConstrained(window()->maximumSize(), window());
}
/*!
@@ -649,7 +649,7 @@ QSize QPlatformWindow::windowMaximumSize() const
*/
QSize QPlatformWindow::windowBaseSize() const
{
- return qHighDpiToDevicePixels(window()->baseSize(), window());
+ return QHighDpi::toDevicePixels(window()->baseSize(), window());
}
/*!
@@ -666,7 +666,7 @@ QSize QPlatformWindow::windowSizeIncrement() const
if (increment.isEmpty())
increment = QSize(1, 1);
- return qHighDpiToDevicePixels(increment, window());
+ return QHighDpi::toDevicePixels(increment, window());
}
/*!
@@ -674,7 +674,7 @@ QSize QPlatformWindow::windowSizeIncrement() const
*/
QRect QPlatformWindow::windowGeometry() const
{
- return qHighDpiToDevicePixels(window()->geometry(), window());
+ return QHighDpi::toDevicePixels(window()->geometry(), window());
}
/*!
diff --git a/src/gui/kernel/qscreen_p.h b/src/gui/kernel/qscreen_p.h
index 222f6e5d26..6967ddcde6 100644
--- a/src/gui/kernel/qscreen_p.h
+++ b/src/gui/kernel/qscreen_p.h
@@ -61,8 +61,8 @@ public:
, orientationUpdateMask(0)
{
orientation = platformScreen->orientation();
- geometry = qHighDpiToDeviceIndependentPixels(platformScreen->geometry());
- availableGeometry = qHighDpiToDeviceIndependentPixels(platformScreen->availableGeometry());
+ geometry = QHighDpi::fromDevicePixels(platformScreen->geometry());
+ availableGeometry = QHighDpi::fromDevicePixels(platformScreen->availableGeometry());
logicalDpi = platformScreen->logicalDpi();
refreshRate = platformScreen->refreshRate();
// safeguard ourselves against buggy platform behavior...
@@ -80,8 +80,8 @@ public:
void updateHighDpi()
{
- geometry = qHighDpiToDeviceIndependentPixels(platformScreen->geometry());
- availableGeometry = qHighDpiToDeviceIndependentPixels(platformScreen->availableGeometry());
+ geometry = QHighDpi::fromDevicePixels(platformScreen->geometry());
+ availableGeometry = QHighDpi::fromDevicePixels(platformScreen->availableGeometry());
}
void updatePrimaryOrientation();
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index eb43c30de5..6b74bd66ed 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -1428,7 +1428,7 @@ void QWindow::setGeometry(const QRect &rect)
d->positionPolicy = QWindowPrivate::WindowFrameExclusive;
if (d->platformWindow) {
- d->platformWindow->setGeometry(qHighDpiToDevicePixels(rect, this));
+ d->platformWindow->setGeometry(QHighDpi::toDevicePixels(rect, this));
} else {
d->geometry = rect;
@@ -1452,7 +1452,7 @@ QRect QWindow::geometry() const
{
Q_D(const QWindow);
if (d->platformWindow)
- return qHighDpiToDeviceIndependentPixels(d->platformWindow->geometry(), this);
+ return QHighDpi::fromDevicePixels(d->platformWindow->geometry(), this);
return d->geometry;
}
@@ -1465,7 +1465,7 @@ QMargins QWindow::frameMargins() const
{
Q_D(const QWindow);
if (d->platformWindow)
- return qHighDpiToDeviceIndependentPixels(d->platformWindow->frameMargins(), this);
+ return QHighDpi::fromDevicePixels(d->platformWindow->frameMargins(), this);
return QMargins();
}
@@ -1479,7 +1479,7 @@ QRect QWindow::frameGeometry() const
Q_D(const QWindow);
if (d->platformWindow) {
QMargins m = frameMargins();
- return qHighDpiToDeviceIndependentPixels(d->platformWindow->geometry(), this).adjusted(-m.left(), -m.top(), m.right(), m.bottom());
+ return QHighDpi::fromDevicePixels(d->platformWindow->geometry(), this).adjusted(-m.left(), -m.top(), m.right(), m.bottom());
}
return d->geometry;
}
@@ -1496,7 +1496,7 @@ QPoint QWindow::framePosition() const
Q_D(const QWindow);
if (d->platformWindow) {
QMargins margins = frameMargins();
- return qHighDpiToDeviceIndependentPixels(d->platformWindow->geometry().topLeft(), this) - QPoint(margins.left(), margins.top());
+ return QHighDpi::fromDevicePixels(d->platformWindow->geometry().topLeft(), this) - QPoint(margins.left(), margins.top());
}
return d->geometry.topLeft();
}
@@ -1512,7 +1512,7 @@ void QWindow::setFramePosition(const QPoint &point)
d->positionPolicy = QWindowPrivate::WindowFrameInclusive;
d->positionAutomatic = false;
if (d->platformWindow) {
- d->platformWindow->setGeometry(qHighDpiToDevicePixels(QRect(point, size()), this));
+ d->platformWindow->setGeometry(QHighDpi::toDevicePixels(QRect(point, size()), this));
} else {
d->geometry.moveTopLeft(point);
}
@@ -1572,7 +1572,7 @@ void QWindow::resize(const QSize &newSize)
{
Q_D(QWindow);
if (d->platformWindow) {
- d->platformWindow->setGeometry(qHighDpiToDevicePixels(QRect(position(), newSize), this));
+ d->platformWindow->setGeometry(QHighDpi::toDevicePixels(QRect(position(), newSize), this));
} else {
const QSize oldSize = d->geometry.size();
d->geometry.setSize(newSize);
diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp
index 26f17789f4..50b7a42a67 100644
--- a/src/gui/kernel/qwindowsysteminterface.cpp
+++ b/src/gui/kernel/qwindowsysteminterface.cpp
@@ -139,7 +139,7 @@ void QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationState
*/
void QWindowSystemInterface::handleGeometryChange(QWindow *tlw, const QRect &newRect, const QRect &oldRect)
{
- QWindowSystemInterfacePrivate::GeometryChangeEvent *e = new QWindowSystemInterfacePrivate::GeometryChangeEvent(tlw, qHighDpiToDeviceIndependentPixels(newRect, tlw), qHighDpiToDeviceIndependentPixels(oldRect, tlw));
+ QWindowSystemInterfacePrivate::GeometryChangeEvent *e = new QWindowSystemInterfacePrivate::GeometryChangeEvent(tlw, QHighDpi::fromDevicePixels(newRect, tlw), QHighDpi::fromDevicePixels(oldRect, tlw));
QWindowSystemInterfacePrivate::handleWindowSystemEvent(e);
}
@@ -168,7 +168,7 @@ void QWindowSystemInterface::handleMouseEvent(QWindow *w, ulong timestamp, const
Qt::KeyboardModifiers mods, Qt::MouseEventSource source)
{
QWindowSystemInterfacePrivate::MouseEvent * e =
- new QWindowSystemInterfacePrivate::MouseEvent(w, timestamp, qHighDpiToDeviceIndependentPixels(local, w), qHighDpiToDeviceIndependentPixels(global, w), b, mods, source);
+ new QWindowSystemInterfacePrivate::MouseEvent(w, timestamp, QHighDpi::fromDevicePixels(local, w), QHighDpi::fromDevicePixels(global, w), b, mods, source);
QWindowSystemInterfacePrivate::handleWindowSystemEvent(e);
}
@@ -185,7 +185,7 @@ void QWindowSystemInterface::handleFrameStrutMouseEvent(QWindow *w, ulong timest
QWindowSystemInterfacePrivate::MouseEvent * e =
new QWindowSystemInterfacePrivate::MouseEvent(w, timestamp,
QWindowSystemInterfacePrivate::FrameStrutMouse,
- qHighDpiToDeviceIndependentPixels(local, w), qHighDpiToDeviceIndependentPixels(global, w), b, mods, source);
+ QHighDpi::fromDevicePixels(local, w), QHighDpi::fromDevicePixels(global, w), b, mods, source);
QWindowSystemInterfacePrivate::handleWindowSystemEvent(e);
}
@@ -366,14 +366,14 @@ void QWindowSystemInterface::handleWheelEvent(QWindow *tlw, ulong timestamp, con
// Simple case: vertical deltas only:
if (angleDelta.y() != 0 && angleDelta.x() == 0) {
- e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, qHighDpiToDeviceIndependentPixels(local, tlw), qHighDpiToDeviceIndependentPixels(global, tlw), pixelDelta, angleDelta, angleDelta.y(), Qt::Vertical, mods, phase, source);
+ e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, QHighDpi::fromDevicePixels(local, tlw), QHighDpi::fromDevicePixels(global, tlw), pixelDelta, angleDelta, angleDelta.y(), Qt::Vertical, mods, phase, source);
QWindowSystemInterfacePrivate::handleWindowSystemEvent(e);
return;
}
// Simple case: horizontal deltas only:
if (angleDelta.y() == 0 && angleDelta.x() != 0) {
- e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, qHighDpiToDeviceIndependentPixels(local, tlw), qHighDpiToDeviceIndependentPixels(global, tlw), pixelDelta, angleDelta, angleDelta.x(), Qt::Horizontal, mods, phase, source);
+ e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, QHighDpi::fromDevicePixels(local, tlw), QHighDpi::fromDevicePixels(global, tlw), pixelDelta, angleDelta, angleDelta.x(), Qt::Horizontal, mods, phase, source);
QWindowSystemInterfacePrivate::handleWindowSystemEvent(e);
return;
}
@@ -381,12 +381,12 @@ void QWindowSystemInterface::handleWheelEvent(QWindow *tlw, ulong timestamp, con
// Both horizontal and vertical deltas: Send two wheel events.
// The first event contains the Qt 5 pixel and angle delta as points,
// and in addition the Qt 4 compatibility vertical angle delta.
- e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, qHighDpiToDeviceIndependentPixels(local, tlw), qHighDpiToDeviceIndependentPixels(global, tlw), pixelDelta, angleDelta, angleDelta.y(), Qt::Vertical, mods, phase, source);
+ e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, QHighDpi::fromDevicePixels(local, tlw), QHighDpi::fromDevicePixels(global, tlw), pixelDelta, angleDelta, angleDelta.y(), Qt::Vertical, mods, phase, source);
QWindowSystemInterfacePrivate::handleWindowSystemEvent(e);
// The second event contains null pixel and angle points and the
// Qt 4 compatibility horizontal angle delta.
- e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, qHighDpiToDeviceIndependentPixels(local, tlw), qHighDpiToDeviceIndependentPixels(global, tlw), QPoint(), QPoint(), angleDelta.x(), Qt::Horizontal, mods, phase, source);
+ e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, QHighDpi::fromDevicePixels(local, tlw), QHighDpi::fromDevicePixels(global, tlw), QPoint(), QPoint(), angleDelta.x(), Qt::Horizontal, mods, phase, source);
QWindowSystemInterfacePrivate::handleWindowSystemEvent(e);
}
@@ -464,16 +464,16 @@ QList<QTouchEvent::TouchPoint> QWindowSystemInterfacePrivate::convertTouchPoints
p.setState(point->state);
const QPointF screenPos = point->area.center();
- p.setScreenPos(qHighDpiToDeviceIndependentPixels(screenPos));
- p.setScreenRect(qHighDpiToDeviceIndependentPixels(point->area));
+ p.setScreenPos(QHighDpi::fromDevicePixels(screenPos));
+ p.setScreenRect(QHighDpi::fromDevicePixels(point->area));
// The local pos and rect are not set, they will be calculated
// when the event gets processed by QGuiApplication.
- p.setNormalizedPos(qHighDpiToDeviceIndependentPixels(point->normalPosition));
- p.setVelocity(qHighDpiToDeviceIndependentPixels(point->velocity));
+ p.setNormalizedPos(QHighDpi::fromDevicePixels(point->normalPosition));
+ p.setVelocity(QHighDpi::fromDevicePixels(point->velocity));
p.setFlags(point->flags);
- p.setRawScreenPositions(qHighDpiToDeviceIndependentPixels(point->rawPositions));
+ p.setRawScreenPositions(QHighDpi::fromDevicePixels(point->rawPositions));
touchPoints.append(p);
++point;
@@ -534,7 +534,7 @@ void QWindowSystemInterface::handleScreenOrientationChange(QScreen *screen, Qt::
void QWindowSystemInterface::handleScreenGeometryChange(QScreen *screen, const QRect &geometry, const QRect &availableGeometry)
{
QWindowSystemInterfacePrivate::ScreenGeometryEvent *e =
- new QWindowSystemInterfacePrivate::ScreenGeometryEvent(screen, qHighDpiToDeviceIndependentPixels(geometry), qHighDpiToDeviceIndependentPixels(availableGeometry));
+ new QWindowSystemInterfacePrivate::ScreenGeometryEvent(screen, QHighDpi::fromDevicePixels(geometry), QHighDpi::fromDevicePixels(availableGeometry));
QWindowSystemInterfacePrivate::handleWindowSystemEvent(e);
}
@@ -560,7 +560,7 @@ void QWindowSystemInterface::handleThemeChange(QWindow *tlw)
void QWindowSystemInterface::handleExposeEvent(QWindow *tlw, const QRegion &region)
{
- QWindowSystemInterfacePrivate::ExposeEvent *e = new QWindowSystemInterfacePrivate::ExposeEvent(tlw, qHighDpiToDeviceIndependentPixels(region, tlw));
+ QWindowSystemInterfacePrivate::ExposeEvent *e = new QWindowSystemInterfacePrivate::ExposeEvent(tlw, QHighDpi::fromDevicePixels(region, tlw));
QWindowSystemInterfacePrivate::handleWindowSystemEvent(e);
}
@@ -627,12 +627,12 @@ int QWindowSystemInterface::windowSystemEventsQueued()
#ifndef QT_NO_DRAGANDDROP
QPlatformDragQtResponse QWindowSystemInterface::handleDrag(QWindow *w, const QMimeData *dropData, const QPoint &p, Qt::DropActions supportedActions)
{
- return QGuiApplicationPrivate::processDrag(w, dropData, qHighDpiToDeviceIndependentPixels(p, w),supportedActions);
+ return QGuiApplicationPrivate::processDrag(w, dropData, QHighDpi::fromDevicePixels(p, w),supportedActions);
}
QPlatformDropQtResponse QWindowSystemInterface::handleDrop(QWindow *w, const QMimeData *dropData, const QPoint &p, Qt::DropActions supportedActions)
{
- return QGuiApplicationPrivate::processDrop(w, dropData, qHighDpiToDeviceIndependentPixels(p, w),supportedActions);
+ return QGuiApplicationPrivate::processDrop(w, dropData, QHighDpi::fromDevicePixels(p, w),supportedActions);
}
#endif // QT_NO_DRAGANDDROP
@@ -667,8 +667,8 @@ void QWindowSystemInterface::handleTabletEvent(QWindow *w, ulong timestamp, cons
{
QWindowSystemInterfacePrivate::TabletEvent *e =
new QWindowSystemInterfacePrivate::TabletEvent(w,timestamp,
- qHighDpiToDeviceIndependentPixels(local, w),
- qHighDpiToDeviceIndependentPixels(global, w),
+ QHighDpi::fromDevicePixels(local, w),
+ QHighDpi::fromDevicePixels(global, w),
device, pointerType, buttons, pressure,
xTilt, yTilt, tangentialPressure, rotation, z, uid, modifiers);
QWindowSystemInterfacePrivate::handleWindowSystemEvent(e);
@@ -797,7 +797,7 @@ Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QWindowSystemInterface::TouchPo
Q_GUI_EXPORT void qt_handleMouseEvent(QWindow *w, const QPointF & local, const QPointF & global, Qt::MouseButtons b, Qt::KeyboardModifiers mods = Qt::NoModifier) {
- QWindowSystemInterface::handleMouseEvent(w, qHighDpiToDevicePixels(local, w), qHighDpiToDevicePixels(global, w), b, mods);
+ QWindowSystemInterface::handleMouseEvent(w, QHighDpi::toDevicePixels(local, w), QHighDpi::toDevicePixels(global, w), b, mods);
}
Q_GUI_EXPORT void qt_handleKeyEvent(QWindow *w, QEvent::Type t, int k, Qt::KeyboardModifiers mods, const QString & text = QString(), bool autorep = false, ushort count = 1)
diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp
index 9c51a86484..f81dcd3cd8 100644
--- a/src/gui/painting/qbackingstore.cpp
+++ b/src/gui/painting/qbackingstore.cpp
@@ -106,7 +106,7 @@ void QBackingStore::flush(const QRegion &region, QWindow *win, const QPoint &off
}
#endif
- d_ptr->platformBackingStore->flush(win, qHighDpiToDevicePixels(region, d_ptr->window), offset);
+ d_ptr->platformBackingStore->flush(win, QHighDpi::toDevicePixels(region, d_ptr->window), offset);
}
/*!
@@ -182,7 +182,7 @@ QWindow* QBackingStore::window() const
void QBackingStore::beginPaint(const QRegion &region)
{
- d_ptr->platformBackingStore->beginPaint(qHighDpiToDevicePixels(region, d_ptr->window));
+ d_ptr->platformBackingStore->beginPaint(QHighDpi::toDevicePixels(region, d_ptr->window));
}
/*!
@@ -203,7 +203,7 @@ void QBackingStore::endPaint()
void QBackingStore::resize(const QSize &size)
{
d_ptr->size = size;
- d_ptr->platformBackingStore->resize(qHighDpiToDevicePixels(size, d_ptr->window), d_ptr->staticContents);
+ d_ptr->platformBackingStore->resize(QHighDpi::toDevicePixels(size, d_ptr->window), d_ptr->staticContents);
}
/*!
@@ -226,7 +226,7 @@ bool QBackingStore::scroll(const QRegion &area, int dx, int dy)
Q_UNUSED(dx);
Q_UNUSED(dy);
- return d_ptr->platformBackingStore->scroll(qHighDpiToDevicePixels(area, d_ptr->window), qHighDpiToDevicePixels(dx, d_ptr->window), qHighDpiToDevicePixels(dy, d_ptr->window));
+ return d_ptr->platformBackingStore->scroll(QHighDpi::toDevicePixels(area, d_ptr->window), QHighDpi::toDevicePixels(dx, d_ptr->window), QHighDpi::toDevicePixels(dy, d_ptr->window));
}
void QBackingStore::setStaticContents(const QRegion &region)
diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.cpp b/src/plugins/platforms/xcb/qxcbbackingstore.cpp
index 38f09597bb..b5ee92cc63 100644
--- a/src/plugins/platforms/xcb/qxcbbackingstore.cpp
+++ b/src/plugins/platforms/xcb/qxcbbackingstore.cpp
@@ -315,7 +315,7 @@ void QXcbBackingStore::beginPaint(const QRegion &region)
return;
int dpr = int(m_image->image()->devicePixelRatio());
- const int windowDpr = int(qHighDpiToDeviceIndependentPixels(window()->devicePixelRatio()));
+ const int windowDpr = int(QHighDpi::fromDevicePixels(window()->devicePixelRatio()));
if (windowDpr != dpr) {
resize(window()->size(), QRegion());
dpr = int(m_image->image()->devicePixelRatio());
@@ -370,10 +370,10 @@ void QXcbBackingStore::flush(QWindow *window, const QRegion &region, const QPoin
if (!m_image || m_image->size().isEmpty())
return;
- // Note on the qHighDpiToDeviceIndependentPixels call below: When scaling
+ // Note on the QHighDpi::fromDevicePixels call below: When scaling
// in QtGui is active this prevents xcb plugin from scalìng in addition
// by keeping "dpr" below at 1.
- const int dpr = int(qHighDpiToDeviceIndependentPixels(window->devicePixelRatio(), window));
+ const int dpr = int(QHighDpi::fromDevicePixels(window->devicePixelRatio(), window));
#ifndef QT_NO_DEBUG
@@ -385,7 +385,7 @@ void QXcbBackingStore::flush(QWindow *window, const QRegion &region, const QPoin
QSize imageSize = m_image->size() / dpr; //because we multiply with the DPR later
QRegion clipped = region;
- clipped &= qHighDpiToDevicePixels(QRect(0, 0, window->width(), window->height()));
+ clipped &= QHighDpi::toDevicePixels(QRect(0, 0, window->width(), window->height()));
clipped &= QRect(0, 0, imageSize.width(), imageSize.height()).translated(-offset);
QRect bounds = clipped.boundingRect();
@@ -435,7 +435,7 @@ void QXcbBackingStore::composeAndFlush(QWindow *window, const QRegion &region, c
void QXcbBackingStore::resize(const QSize &size, const QRegion &)
{
- const int dpr = int(qHighDpiToDeviceIndependentPixels(window()->devicePixelRatio(), window()));
+ const int dpr = int(QHighDpi::fromDevicePixels(window()->devicePixelRatio(), window()));
const QSize xSize = size * dpr;
if (m_image && xSize == m_image->size() && dpr == m_image->image()->devicePixelRatio())
return;
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index b50b6b8965..4b94923f7d 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -390,8 +390,8 @@ void QXcbWindow::create()
} else if (minimumSize.width() > 0 || minimumSize.height() > 0) {
rect.setSize(minimumSize);
} else {
- rect.setWidth(qHighDpiToDevicePixels(int(defaultWindowWidth)));
- rect.setHeight(qHighDpiToDevicePixels(int(defaultWindowHeight)));
+ rect.setWidth(QHighDpi::toDevicePixels(int(defaultWindowWidth)));
+ rect.setHeight(QHighDpi::toDevicePixels(int(defaultWindowHeight)));
}
xcb_window_t xcb_parent_id = platformScreen->root();
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 06:10:32 +0000