diff options
-rw-r--r-- | src/gui/kernel/qcursor.cpp | 4 | ||||
-rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 2 | ||||
-rw-r--r-- | src/gui/kernel/qhighdpiscaling.cpp | 6 | ||||
-rw-r--r-- | src/gui/kernel/qhighdpiscaling_p.h | 62 | ||||
-rw-r--r-- | src/gui/kernel/qplatformscreen.cpp | 8 | ||||
-rw-r--r-- | src/gui/kernel/qplatformwindow.cpp | 10 | ||||
-rw-r--r-- | src/gui/kernel/qscreen_p.h | 8 | ||||
-rw-r--r-- | src/gui/kernel/qwindow.cpp | 14 | ||||
-rw-r--r-- | src/gui/kernel/qwindowsysteminterface.cpp | 38 | ||||
-rw-r--r-- | src/gui/painting/qbackingstore.cpp | 8 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qxcbbackingstore.cpp | 10 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 4 |
12 files changed, 87 insertions, 87 deletions
diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp index dc1b6dca76..92e591f8ac 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 QHighDpi::fromDevicePixels(cursor->pos()); + return QHighDpi::fromNativePixels(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 = QHighDpi::toDevicePixels(QPoint(x, y)); + const QPoint devicePos = QHighDpi::toNativePixels(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 5ef5ec2115..1665909814 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 = QHighDpi::toDevicePixels(pos); + const QPoint devicePosition = QHighDpi::toNativePixels(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 0d847a243f..ff3f48b33f 100644 --- a/src/gui/kernel/qhighdpiscaling.cpp +++ b/src/gui/kernel/qhighdpiscaling.cpp @@ -124,14 +124,14 @@ qreal QHighDpiScaling::factor(const QWindow *window) return f * (windowFactor.isValid() ? windowFactor.toReal() : 1); } -Q_GUI_EXPORT QSize QHighDpi::toDevicePixelsConstrained(const QSize &size, const QWindow *window) +Q_GUI_EXPORT QSize QHighDpi::toNativePixelsConstrained(const QSize &size, const QWindow *window) { const int width = size.width(); const int height = size.height(); return QSize(width > 0 && width < QWINDOWSIZE_MAX ? - QHighDpi::toDevicePixels(width, window) : width, + QHighDpi::toNativePixels(width, window) : width, height > 0 && height < QWINDOWSIZE_MAX ? - QHighDpi::toDevicePixels(height, window) : height); + QHighDpi::toNativePixels(height, window) : height); } QT_END_NAMESPACE diff --git a/src/gui/kernel/qhighdpiscaling_p.h b/src/gui/kernel/qhighdpiscaling_p.h index 5827bc1565..47cfe684b8 100644 --- a/src/gui/kernel/qhighdpiscaling_p.h +++ b/src/gui/kernel/qhighdpiscaling_p.h @@ -91,117 +91,117 @@ private: }; // Coordinate system conversion functions: -// QHighDpi::fromDevicePixels : from physical(screen/backing) to logical pixels -// QHighDpi::toDevicePixels : from logical to physical pixels +// QHighDpi::fromNativePixels : from physical(screen/backing) to logical pixels +// QHighDpi::toNativePixels : from logical to physical pixels namespace QHighDpi { -inline QRect fromDevicePixels(const QRect &pixelRect, const QWindow *window = 0) +inline QRect fromNativePixels(const QRect &pixelRect, const QWindow *window = 0) { const qreal scaleFactor = QHighDpiScaling::factor(window); return QRect(pixelRect.topLeft() / scaleFactor, pixelRect.size() / scaleFactor); } -inline QRect toDevicePixels(const QRect &pointRect, const QWindow *window = 0) +inline QRect toNativePixels(const QRect &pointRect, const QWindow *window = 0) { const qreal scaleFactor = QHighDpiScaling::factor(window); return QRect(pointRect.topLeft() * scaleFactor, pointRect.size() * scaleFactor); } -inline QRectF fromDevicePixels(const QRectF &pixelRect, const QWindow *window = 0) +inline QRectF fromNativePixels(const QRectF &pixelRect, const QWindow *window = 0) { const qreal scaleFactor = QHighDpiScaling::factor(window); return QRectF(pixelRect.topLeft() / scaleFactor, pixelRect.size() / scaleFactor); } -inline QRectF toDevicePixels(const QRectF &pointRect, const QWindow *window = 0) +inline QRectF toNativePixels(const QRectF &pointRect, const QWindow *window = 0) { const qreal scaleFactor = QHighDpiScaling::factor(window); return QRectF(pointRect.topLeft() * scaleFactor, pointRect.size() * scaleFactor); } -inline QSize fromDevicePixels(const QSize &pixelSize, const QWindow *window = 0) +inline QSize fromNativePixels(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 toDevicePixelsConstrained(const QSize &size, const QWindow *window = 0); +Q_GUI_EXPORT QSize toNativePixelsConstrained(const QSize &size, const QWindow *window = 0); -inline QSize toDevicePixels(const QSize &pointSize, const QWindow *window = 0) +inline QSize toNativePixels(const QSize &pointSize, const QWindow *window = 0) { return pointSize * QHighDpiScaling::factor(window); } -inline QSizeF fromDevicePixels(const QSizeF &pixelSize, const QWindow *window = 0) +inline QSizeF fromNativePixels(const QSizeF &pixelSize, const QWindow *window = 0) { return pixelSize / QHighDpiScaling::factor(window); } -inline QSizeF toDevicePixels(const QSizeF &pointSize, const QWindow *window = 0) +inline QSizeF toNativePixels(const QSizeF &pointSize, const QWindow *window = 0) { return pointSize * QHighDpiScaling::factor(window); } -inline QPoint fromDevicePixels(const QPoint &pixelPoint, const QWindow *window = 0) +inline QPoint fromNativePixels(const QPoint &pixelPoint, const QWindow *window = 0) { return pixelPoint / QHighDpiScaling::factor(window); } -inline QPoint toDevicePixels(const QPoint &pointPoint, const QWindow *window = 0) +inline QPoint toNativePixels(const QPoint &pointPoint, const QWindow *window = 0) { return pointPoint * QHighDpiScaling::factor(window); } -inline QPointF fromDevicePixels(const QPointF &pixelPoint, const QWindow *window = 0) +inline QPointF fromNativePixels(const QPointF &pixelPoint, const QWindow *window = 0) { return pixelPoint / QHighDpiScaling::factor(window); } -inline QPointF toDevicePixels(const QPointF &pointPoint, const QWindow *window = 0) +inline QPointF toNativePixels(const QPointF &pointPoint, const QWindow *window = 0) { return pointPoint * QHighDpiScaling::factor(window); } -inline QMargins fromDevicePixels(const QMargins &pixelMargins, const QWindow *window = 0) +inline QMargins fromNativePixels(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 toDevicePixels(const QMargins &pointMargins, const QWindow *window = 0) +inline QMargins toNativePixels(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 fromDevicePixels(const QRegion &pixelRegion, const QWindow *window = 0) +inline QRegion fromNativePixels(const QRegion &pixelRegion, const QWindow *window = 0) { if (!QHighDpiScaling::isActive()) return pixelRegion; QRegion pointRegion; foreach (const QRect &rect, pixelRegion.rects()) - pointRegion += fromDevicePixels(rect, window); + pointRegion += fromNativePixels(rect, window); return pointRegion; } -inline QRegion toDevicePixels(const QRegion &pointRegion, const QWindow *window = 0) +inline QRegion toNativePixels(const QRegion &pointRegion, const QWindow *window = 0) { if (!QHighDpiScaling::isActive()) return pointRegion; QRegion pixelRegon; foreach (const QRect &rect, pointRegion.rects()) - pixelRegon += toDevicePixels(rect, window); + pixelRegon += toNativePixels(rect, window); return pixelRegon; } // Any T that has operator/() template <typename T> -T fromDevicePixels(const T &pixelValue, const QWindow *window = 0) +T fromNativePixels(const T &pixelValue, const QWindow *window = 0) { if (!QHighDpiScaling::isActive()) return pixelValue; @@ -212,7 +212,7 @@ T fromDevicePixels(const T &pixelValue, const QWindow *window = 0) // Any T that has operator*() template <typename T> -T toDevicePixels(const T &pointValue, const QWindow *window = 0) +T toNativePixels(const T &pointValue, const QWindow *window = 0) { if (!QHighDpiScaling::isActive()) return pointValue; @@ -222,7 +222,7 @@ T toDevicePixels(const T &pointValue, const QWindow *window = 0) // Any QVector<T> where T has operator/() template <typename T> -QVector<T> fromDevicePixels(const QVector<T> &pixelValues, const QWindow *window = 0) +QVector<T> fromNativePixels(const QVector<T> &pixelValues, const QWindow *window = 0) { if (!QHighDpiScaling::isActive()) return pixelValues; @@ -235,7 +235,7 @@ QVector<T> fromDevicePixels(const QVector<T> &pixelValues, const QWindow *window // Any QVector<T> where T has operator*() template <typename T> -QVector<T> toDevicePixels(const QVector<T> &pointValues, const QWindow *window = 0) +QVector<T> toNativePixels(const QVector<T> &pointValues, const QWindow *window = 0) { if (!QHighDpiScaling::isActive()) return pointValues; @@ -249,18 +249,18 @@ QVector<T> toDevicePixels(const QVector<T> &pointValues, const QWindow *window = // Any QPair<T, U> where T and U has operator/() template <typename T, typename U> -QPair<T, U> fromDevicePixels(const QPair<T, U> &pixelPair, const QWindow *window = 0) +QPair<T, U> fromNativePixels(const QPair<T, U> &pixelPair, const QWindow *window = 0) { - return qMakePair(fromDevicePixels(pixelPair.first, window), - fromDevicePixels(pixelPair.second, window)); + return qMakePair(fromNativePixels(pixelPair.first, window), + fromNativePixels(pixelPair.second, window)); } // Any QPair<T, U> where T and U has operator*() template <typename T, typename U> -QPair<T, U> toDevicePixels(const QPair<T, U> &pointPair, const QWindow *window = 0) +QPair<T, U> toNativePixels(const QPair<T, U> &pointPair, const QWindow *window = 0) { - return qMakePair(QHighDpi::toDevicePixels(pointPair.first, window), - QHighDpi::toDevicePixels(pointPair.second, window)); + return qMakePair(QHighDpi::toNativePixels(pointPair.first, window), + QHighDpi::toNativePixels(pointPair.second, window)); } } diff --git a/src/gui/kernel/qplatformscreen.cpp b/src/gui/kernel/qplatformscreen.cpp index 6088e6495e..f545009f3a 100644 --- a/src/gui/kernel/qplatformscreen.cpp +++ b/src/gui/kernel/qplatformscreen.cpp @@ -301,8 +301,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 = QHighDpi::fromDevicePixels(geometry()); - const QRect newAvailableGeometry = QHighDpi::fromDevicePixels(availableGeometry()); + const QRect newGeometry = QHighDpi::fromNativePixels(geometry()); + const QRect newAvailableGeometry = QHighDpi::fromNativePixels(availableGeometry()); // make sure maximized and fullscreen windows are updated for (int i = 0; i < windows.size(); ++i) { @@ -406,12 +406,12 @@ QRect QPlatformScreen::mapBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation QRect QPlatformScreen::screenGeometry() const { - return QHighDpi::toDevicePixels(screen()->geometry()); + return QHighDpi::toNativePixels(screen()->geometry()); } QRect QPlatformScreen::screenAvailableGeometry() const { - return QHighDpi::toDevicePixels(screen()->availableGeometry()); + return QHighDpi::toNativePixels(screen()->availableGeometry()); } /*! diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp index 7b9eadbe17..22523ec21f 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 QHighDpi::toDevicePixelsConstrained(window()->minimumSize(), window()); + return QHighDpi::toNativePixelsConstrained(window()->minimumSize(), window()); } /*! @@ -641,7 +641,7 @@ QSize QPlatformWindow::windowMinimumSize() const */ QSize QPlatformWindow::windowMaximumSize() const { - return QHighDpi::toDevicePixelsConstrained(window()->maximumSize(), window()); + return QHighDpi::toNativePixelsConstrained(window()->maximumSize(), window()); } /*! @@ -649,7 +649,7 @@ QSize QPlatformWindow::windowMaximumSize() const */ QSize QPlatformWindow::windowBaseSize() const { - return QHighDpi::toDevicePixels(window()->baseSize(), window()); + return QHighDpi::toNativePixels(window()->baseSize(), window()); } /*! @@ -666,7 +666,7 @@ QSize QPlatformWindow::windowSizeIncrement() const if (increment.isEmpty()) increment = QSize(1, 1); - return QHighDpi::toDevicePixels(increment, window()); + return QHighDpi::toNativePixels(increment, window()); } /*! @@ -674,7 +674,7 @@ QSize QPlatformWindow::windowSizeIncrement() const */ QRect QPlatformWindow::windowGeometry() const { - return QHighDpi::toDevicePixels(window()->geometry(), window()); + return QHighDpi::toNativePixels(window()->geometry(), window()); } /*! diff --git a/src/gui/kernel/qscreen_p.h b/src/gui/kernel/qscreen_p.h index 6967ddcde6..45c8746131 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 = QHighDpi::fromDevicePixels(platformScreen->geometry()); - availableGeometry = QHighDpi::fromDevicePixels(platformScreen->availableGeometry()); + geometry = QHighDpi::fromNativePixels(platformScreen->geometry()); + availableGeometry = QHighDpi::fromNativePixels(platformScreen->availableGeometry()); logicalDpi = platformScreen->logicalDpi(); refreshRate = platformScreen->refreshRate(); // safeguard ourselves against buggy platform behavior... @@ -80,8 +80,8 @@ public: void updateHighDpi() { - geometry = QHighDpi::fromDevicePixels(platformScreen->geometry()); - availableGeometry = QHighDpi::fromDevicePixels(platformScreen->availableGeometry()); + geometry = QHighDpi::fromNativePixels(platformScreen->geometry()); + availableGeometry = QHighDpi::fromNativePixels(platformScreen->availableGeometry()); } void updatePrimaryOrientation(); diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index e376df24cb..920119464f 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -1432,7 +1432,7 @@ void QWindow::setGeometry(const QRect &rect) d->positionPolicy = QWindowPrivate::WindowFrameExclusive; if (d->platformWindow) { - d->platformWindow->setGeometry(QHighDpi::toDevicePixels(rect, this)); + d->platformWindow->setGeometry(QHighDpi::toNativePixels(rect, this)); } else { d->geometry = rect; @@ -1456,7 +1456,7 @@ QRect QWindow::geometry() const { Q_D(const QWindow); if (d->platformWindow) - return QHighDpi::fromDevicePixels(d->platformWindow->geometry(), this); + return QHighDpi::fromNativePixels(d->platformWindow->geometry(), this); return d->geometry; } @@ -1469,7 +1469,7 @@ QMargins QWindow::frameMargins() const { Q_D(const QWindow); if (d->platformWindow) - return QHighDpi::fromDevicePixels(d->platformWindow->frameMargins(), this); + return QHighDpi::fromNativePixels(d->platformWindow->frameMargins(), this); return QMargins(); } @@ -1483,7 +1483,7 @@ QRect QWindow::frameGeometry() const Q_D(const QWindow); if (d->platformWindow) { QMargins m = frameMargins(); - return QHighDpi::fromDevicePixels(d->platformWindow->geometry(), this).adjusted(-m.left(), -m.top(), m.right(), m.bottom()); + return QHighDpi::fromNativePixels(d->platformWindow->geometry(), this).adjusted(-m.left(), -m.top(), m.right(), m.bottom()); } return d->geometry; } @@ -1500,7 +1500,7 @@ QPoint QWindow::framePosition() const Q_D(const QWindow); if (d->platformWindow) { QMargins margins = frameMargins(); - return QHighDpi::fromDevicePixels(d->platformWindow->geometry().topLeft(), this) - QPoint(margins.left(), margins.top()); + return QHighDpi::fromNativePixels(d->platformWindow->geometry().topLeft(), this) - QPoint(margins.left(), margins.top()); } return d->geometry.topLeft(); } @@ -1516,7 +1516,7 @@ void QWindow::setFramePosition(const QPoint &point) d->positionPolicy = QWindowPrivate::WindowFrameInclusive; d->positionAutomatic = false; if (d->platformWindow) { - d->platformWindow->setGeometry(QHighDpi::toDevicePixels(QRect(point, size()), this)); + d->platformWindow->setGeometry(QHighDpi::toNativePixels(QRect(point, size()), this)); } else { d->geometry.moveTopLeft(point); } @@ -1576,7 +1576,7 @@ void QWindow::resize(const QSize &newSize) { Q_D(QWindow); if (d->platformWindow) { - d->platformWindow->setGeometry(QHighDpi::toDevicePixels(QRect(position(), newSize), this)); + d->platformWindow->setGeometry(QHighDpi::toNativePixels(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 50b7a42a67..a08708269b 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, QHighDpi::fromDevicePixels(newRect, tlw), QHighDpi::fromDevicePixels(oldRect, tlw)); + QWindowSystemInterfacePrivate::GeometryChangeEvent *e = new QWindowSystemInterfacePrivate::GeometryChangeEvent(tlw, QHighDpi::fromNativePixels(newRect, tlw), QHighDpi::fromNativePixels(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, QHighDpi::fromDevicePixels(local, w), QHighDpi::fromDevicePixels(global, w), b, mods, source); + new QWindowSystemInterfacePrivate::MouseEvent(w, timestamp, QHighDpi::fromNativePixels(local, w), QHighDpi::fromNativePixels(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, - QHighDpi::fromDevicePixels(local, w), QHighDpi::fromDevicePixels(global, w), b, mods, source); + QHighDpi::fromNativePixels(local, w), QHighDpi::fromNativePixels(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, QHighDpi::fromDevicePixels(local, tlw), QHighDpi::fromDevicePixels(global, tlw), pixelDelta, angleDelta, angleDelta.y(), Qt::Vertical, mods, phase, source); + e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, QHighDpi::fromNativePixels(local, tlw), QHighDpi::fromNativePixels(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, QHighDpi::fromDevicePixels(local, tlw), QHighDpi::fromDevicePixels(global, tlw), pixelDelta, angleDelta, angleDelta.x(), Qt::Horizontal, mods, phase, source); + e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, QHighDpi::fromNativePixels(local, tlw), QHighDpi::fromNativePixels(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, QHighDpi::fromDevicePixels(local, tlw), QHighDpi::fromDevicePixels(global, tlw), pixelDelta, angleDelta, angleDelta.y(), Qt::Vertical, mods, phase, source); + e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, QHighDpi::fromNativePixels(local, tlw), QHighDpi::fromNativePixels(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, QHighDpi::fromDevicePixels(local, tlw), QHighDpi::fromDevicePixels(global, tlw), QPoint(), QPoint(), angleDelta.x(), Qt::Horizontal, mods, phase, source); + e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, QHighDpi::fromNativePixels(local, tlw), QHighDpi::fromNativePixels(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(QHighDpi::fromDevicePixels(screenPos)); - p.setScreenRect(QHighDpi::fromDevicePixels(point->area)); + p.setScreenPos(QHighDpi::fromNativePixels(screenPos)); + p.setScreenRect(QHighDpi::fromNativePixels(point->area)); // The local pos and rect are not set, they will be calculated // when the event gets processed by QGuiApplication. - p.setNormalizedPos(QHighDpi::fromDevicePixels(point->normalPosition)); - p.setVelocity(QHighDpi::fromDevicePixels(point->velocity)); + p.setNormalizedPos(QHighDpi::fromNativePixels(point->normalPosition)); + p.setVelocity(QHighDpi::fromNativePixels(point->velocity)); p.setFlags(point->flags); - p.setRawScreenPositions(QHighDpi::fromDevicePixels(point->rawPositions)); + p.setRawScreenPositions(QHighDpi::fromNativePixels(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, QHighDpi::fromDevicePixels(geometry), QHighDpi::fromDevicePixels(availableGeometry)); + new QWindowSystemInterfacePrivate::ScreenGeometryEvent(screen, QHighDpi::fromNativePixels(geometry), QHighDpi::fromNativePixels(availableGeometry)); QWindowSystemInterfacePrivate::handleWindowSystemEvent(e); } @@ -560,7 +560,7 @@ void QWindowSystemInterface::handleThemeChange(QWindow *tlw) void QWindowSystemInterface::handleExposeEvent(QWindow *tlw, const QRegion ®ion) { - QWindowSystemInterfacePrivate::ExposeEvent *e = new QWindowSystemInterfacePrivate::ExposeEvent(tlw, QHighDpi::fromDevicePixels(region, tlw)); + QWindowSystemInterfacePrivate::ExposeEvent *e = new QWindowSystemInterfacePrivate::ExposeEvent(tlw, QHighDpi::fromNativePixels(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, QHighDpi::fromDevicePixels(p, w),supportedActions); + return QGuiApplicationPrivate::processDrag(w, dropData, QHighDpi::fromNativePixels(p, w),supportedActions); } QPlatformDropQtResponse QWindowSystemInterface::handleDrop(QWindow *w, const QMimeData *dropData, const QPoint &p, Qt::DropActions supportedActions) { - return QGuiApplicationPrivate::processDrop(w, dropData, QHighDpi::fromDevicePixels(p, w),supportedActions); + return QGuiApplicationPrivate::processDrop(w, dropData, QHighDpi::fromNativePixels(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, - QHighDpi::fromDevicePixels(local, w), - QHighDpi::fromDevicePixels(global, w), + QHighDpi::fromNativePixels(local, w), + QHighDpi::fromNativePixels(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, QHighDpi::toDevicePixels(local, w), QHighDpi::toDevicePixels(global, w), b, mods); + QWindowSystemInterface::handleMouseEvent(w, QHighDpi::toNativePixels(local, w), QHighDpi::toNativePixels(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 d35814df0a..cff99722f3 100644 --- a/src/gui/painting/qbackingstore.cpp +++ b/src/gui/painting/qbackingstore.cpp @@ -106,7 +106,7 @@ void QBackingStore::flush(const QRegion ®ion, QWindow *win, const QPoint &off } #endif - d_ptr->platformBackingStore->flush(win, QHighDpi::toDevicePixels(region, d_ptr->window), offset); + d_ptr->platformBackingStore->flush(win, QHighDpi::toNativePixels(region, d_ptr->window), offset); } /*! @@ -182,7 +182,7 @@ QWindow* QBackingStore::window() const void QBackingStore::beginPaint(const QRegion ®ion) { - d_ptr->platformBackingStore->beginPaint(QHighDpi::toDevicePixels(region, d_ptr->window)); + d_ptr->platformBackingStore->beginPaint(QHighDpi::toNativePixels(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(QHighDpi::toDevicePixels(size, d_ptr->window), d_ptr->staticContents); + d_ptr->platformBackingStore->resize(QHighDpi::toNativePixels(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(QHighDpi::toDevicePixels(area, d_ptr->window), QHighDpi::toDevicePixels(dx, d_ptr->window), QHighDpi::toDevicePixels(dy, d_ptr->window)); + return d_ptr->platformBackingStore->scroll(QHighDpi::toNativePixels(area, d_ptr->window), QHighDpi::toNativePixels(dx, d_ptr->window), QHighDpi::toNativePixels(dy, d_ptr->window)); } void QBackingStore::setStaticContents(const QRegion ®ion) diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.cpp b/src/plugins/platforms/xcb/qxcbbackingstore.cpp index b5ee92cc63..e59e5cb99c 100644 --- a/src/plugins/platforms/xcb/qxcbbackingstore.cpp +++ b/src/plugins/platforms/xcb/qxcbbackingstore.cpp @@ -315,7 +315,7 @@ void QXcbBackingStore::beginPaint(const QRegion ®ion) return; int dpr = int(m_image->image()->devicePixelRatio()); - const int windowDpr = int(QHighDpi::fromDevicePixels(window()->devicePixelRatio())); + const int windowDpr = int(QHighDpi::fromNativePixels(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 ®ion, const QPoin if (!m_image || m_image->size().isEmpty()) return; - // Note on the QHighDpi::fromDevicePixels call below: When scaling + // Note on the QHighDpi::fromNativePixels 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(QHighDpi::fromDevicePixels(window->devicePixelRatio(), window)); + const int dpr = int(QHighDpi::fromNativePixels(window->devicePixelRatio(), window)); #ifndef QT_NO_DEBUG @@ -385,7 +385,7 @@ void QXcbBackingStore::flush(QWindow *window, const QRegion ®ion, const QPoin QSize imageSize = m_image->size() / dpr; //because we multiply with the DPR later QRegion clipped = region; - clipped &= QHighDpi::toDevicePixels(QRect(0, 0, window->width(), window->height())); + clipped &= QHighDpi::toNativePixels(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 ®ion, c void QXcbBackingStore::resize(const QSize &size, const QRegion &) { - const int dpr = int(QHighDpi::fromDevicePixels(window()->devicePixelRatio(), window())); + const int dpr = int(QHighDpi::fromNativePixels(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 c1792c7b1e..c3e61e5847 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -424,8 +424,8 @@ void QXcbWindow::create() } else if (minimumSize.width() > 0 || minimumSize.height() > 0) { rect.setSize(minimumSize); } else { - rect.setWidth(QHighDpi::toDevicePixels(int(defaultWindowWidth))); - rect.setHeight(QHighDpi::toDevicePixels(int(defaultWindowHeight))); + rect.setWidth(QHighDpi::toNativePixels(int(defaultWindowWidth))); + rect.setHeight(QHighDpi::toNativePixels(int(defaultWindowHeight))); } xcb_window_t xcb_parent_id = platformScreen->root(); |