summaryrefslogtreecommitdiffstats
path: root/src/compositor
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2016-12-07 11:52:55 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2016-12-16 15:02:46 +0000
commit4e7af898b28fa8995582a4c0df0455a575525911 (patch)
tree3f79310ac8f282c978329579f627b2b7616712be /src/compositor
parent391c71b4488d69f3a0b16171b01f569fbc9ec07b (diff)
Add support for running compositors with custom device pixel ratio
And add a manual test for showing that it works with different scale factors as well. Task-number: QTBUG-55303 Change-Id: Ib842ea51cfb62a2d46713e95d56b8a9da445d14d Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org>
Diffstat (limited to 'src/compositor')
-rw-r--r--src/compositor/compositor_api/qwaylandoutput.cpp10
-rw-r--r--src/compositor/compositor_api/qwaylandquickitem.cpp5
-rw-r--r--src/compositor/compositor_api/qwaylandquickitem_p.h2
-rw-r--r--src/compositor/extensions/qwaylandwlshellintegration.cpp17
-rw-r--r--src/compositor/extensions/qwaylandwlshellintegration_p.h1
5 files changed, 23 insertions, 12 deletions
diff --git a/src/compositor/compositor_api/qwaylandoutput.cpp b/src/compositor/compositor_api/qwaylandoutput.cpp
index 0129bd33b..48d743f1b 100644
--- a/src/compositor/compositor_api/qwaylandoutput.cpp
+++ b/src/compositor/compositor_api/qwaylandoutput.cpp
@@ -276,7 +276,7 @@ void QWaylandOutput::initialize()
// Replace modes with one that follows the window size and refresh rate,
// but only if window size is valid
if (d->window && d->sizeFollowsWindow) {
- QWaylandOutputMode mode(d->window->size(),
+ QWaylandOutputMode mode(d->window->size() * d->window->devicePixelRatio(),
qFloor(d->window->screen()->refreshRate() * 1000));
if (mode.isValid()) {
d->modes.clear();
@@ -933,13 +933,13 @@ void QWaylandOutput::handleSetWidth(int newWidth)
if (d->currentMode <= d->modes.size() - 1) {
if (d->currentMode >= 0) {
QWaylandOutputMode mode = d->modes.at(d->currentMode);
- mode.setWidth(newWidth);
+ mode.setWidth(newWidth * d->window->devicePixelRatio());
d->modes.replace(d->currentMode, mode);
d->sendModesInfo();
} else {
// We didn't add a mode during the initialization because the window
// size was invalid, let's add it now
- QWaylandOutputMode mode(d->window->size(),
+ QWaylandOutputMode mode(d->window->size() * d->window->devicePixelRatio(),
qFloor(d->window->screen()->refreshRate() * 1000));
if (mode.isValid()) {
d->modes.clear();
@@ -963,13 +963,13 @@ void QWaylandOutput::handleSetHeight(int newHeight)
if (d->currentMode <= d->modes.size() - 1) {
if (d->currentMode >= 0) {
QWaylandOutputMode mode = d->modes.at(d->currentMode);
- mode.setHeight(newHeight);
+ mode.setHeight(newHeight * d->window->devicePixelRatio());
d->modes.replace(d->currentMode, mode);
d->sendModesInfo();
} else {
// We didn't add a mode during the initialization because the window
// size was invalid, let's add it now
- QWaylandOutputMode mode(d->window->size(),
+ QWaylandOutputMode mode(d->window->size() * d->window->devicePixelRatio(),
qFloor(d->window->screen()->refreshRate() * 1000));
if (mode.isValid()) {
d->modes.clear();
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp
index 7e44dfae7..1752fa98e 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.cpp
+++ b/src/compositor/compositor_api/qwaylandquickitem.cpp
@@ -1266,5 +1266,8 @@ void QWaylandQuickItem::handleDragStarted(QWaylandDrag *drag)
d->isDragging = true;
}
-QT_END_NAMESPACE
+qreal QWaylandQuickItemPrivate::scaleFactor() const {
+ return (view->output() ? view->output()->scaleFactor() : 1) / window->devicePixelRatio();
+}
+QT_END_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandquickitem_p.h b/src/compositor/compositor_api/qwaylandquickitem_p.h
index fc69fe09c..f597f8d3e 100644
--- a/src/compositor/compositor_api/qwaylandquickitem_p.h
+++ b/src/compositor/compositor_api/qwaylandquickitem_p.h
@@ -159,7 +159,7 @@ public:
}
bool shouldSendInputEvents() const { return view->surface() && inputEventsEnabled; }
- int scaleFactor() const { return view->output() ? view->output()->scaleFactor() : 1; }
+ qreal scaleFactor() const;
static QMutex *mutex;
diff --git a/src/compositor/extensions/qwaylandwlshellintegration.cpp b/src/compositor/extensions/qwaylandwlshellintegration.cpp
index abf5b627c..b32416764 100644
--- a/src/compositor/extensions/qwaylandwlshellintegration.cpp
+++ b/src/compositor/extensions/qwaylandwlshellintegration.cpp
@@ -125,7 +125,8 @@ void WlShellIntegration::handleSetMaximized(QWaylandOutput *output)
nextState = State::Maximized;
finalPosition = designatedOutput->position() + designatedOutput->availableGeometry().topLeft();
- m_shellSurface->sendConfigure(designatedOutput->availableGeometry().size(), QWaylandWlShellSurface::NoneEdge);
+ auto scaleFactor = m_item->view()->output()->scaleFactor();
+ m_shellSurface->sendConfigure(designatedOutput->availableGeometry().size() / scaleFactor, QWaylandWlShellSurface::NoneEdge);
}
void WlShellIntegration::handleSetFullScreen(QWaylandWlShellSurface::FullScreenMethod method, uint framerate, QWaylandOutput *output)
@@ -176,8 +177,9 @@ void WlShellIntegration::handleSetPopup(QWaylandSeat *seat, QWaylandSurface *par
t.clear(&t);
m_item->setRotation(0);
m_item->setScale(1.0);
- m_item->setX(relativeToParent.x());
- m_item->setY(relativeToParent.y());
+ auto scaleFactor = m_item->output()->scaleFactor() / devicePixelRatio();
+ m_item->setX(relativeToParent.x() * scaleFactor);
+ m_item->setY(relativeToParent.y() * scaleFactor);
m_item->setParentItem(parentItem);
}
@@ -206,6 +208,11 @@ void WlShellIntegration::handlePopupRemoved()
isPopup = false;
}
+qreal WlShellIntegration::devicePixelRatio() const
+{
+ return m_item->window() ? m_item->window()->devicePixelRatio() : 1;
+}
+
void WlShellIntegration::handleShellSurfaceDestroyed()
{
if (isPopup)
@@ -237,7 +244,7 @@ void WlShellIntegration::adjustOffsetForNextFrame(const QPointF &offset)
float scaleFactor = m_item->view()->output()->scaleFactor();
QQuickItem *moveItem = m_item->moveItem();
- moveItem->setPosition(moveItem->position() + offset * scaleFactor);
+ moveItem->setPosition(moveItem->position() + offset * scaleFactor / devicePixelRatio());
}
bool WlShellIntegration::mouseMoveEvent(QMouseEvent *event)
@@ -250,7 +257,7 @@ bool WlShellIntegration::mouseMoveEvent(QMouseEvent *event)
return true;
}
float scaleFactor = m_item->view()->output()->scaleFactor();
- QPointF delta = (event->windowPos() - resizeState.initialMousePos) / scaleFactor;
+ QPointF delta = (event->windowPos() - resizeState.initialMousePos) / scaleFactor * devicePixelRatio();
QSize newSize = m_shellSurface->sizeForResize(resizeState.initialSize, delta, resizeState.resizeEdges);
m_shellSurface->sendConfigure(newSize, resizeState.resizeEdges);
} else if (grabberState == GrabberState::Move) {
diff --git a/src/compositor/extensions/qwaylandwlshellintegration_p.h b/src/compositor/extensions/qwaylandwlshellintegration_p.h
index c0bbcfd10..d5ecffac1 100644
--- a/src/compositor/extensions/qwaylandwlshellintegration_p.h
+++ b/src/compositor/extensions/qwaylandwlshellintegration_p.h
@@ -86,6 +86,7 @@ private:
void handlePopupClosed();
void handlePopupRemoved();
+ qreal devicePixelRatio() const;
QWaylandQuickShellSurfaceItem *m_item;
QPointer<QWaylandWlShellSurface> m_shellSurface;