diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2016-05-04 12:25:12 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2016-05-06 10:06:25 +0000 |
| commit | c07dc0c5cd138db2f222c6c58bc5778532cecf42 (patch) | |
| tree | bf815f203bfb0d7cfb29a33698ead73494186f20 | |
| parent | 7cec1c3ea60694f98bdf8f68d2b5017b5b3f39e6 (diff) | |
| download | qtwayland-c07dc0c5cd138db2f222c6c58bc5778532cecf42.tar.gz | |
Postpone QWaylandQuickItem size update after setting output
This is needed so the correct scale factor is used (specific for each
output). The cursor surfaces for weston-terminal should now scale
correctly.
Change-Id: I7ae9277439034ce68013fc849753da75be729453
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp index d2a5036c..f79e6193 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -745,8 +745,6 @@ void QWaylandQuickItem::handleSurfaceChanged() connect(newSurface->inputMethodControl(), &QWaylandInputMethodControl::updateInputMethod, this, &QWaylandQuickItem::updateInputMethod); #endif - updateSize(); - if (newSurface->origin() != d->origin) { d->origin = newSurface->origin(); emit originChanged(); @@ -755,6 +753,8 @@ void QWaylandQuickItem::handleSurfaceChanged() QWaylandOutput *output = newSurface->compositor()->outputFor(window()); d->view->setOutput(output); } + + updateSize(); } surfaceChangedEvent(d->view->surface(), d->oldSurface); d->oldSurface = d->view->surface(); |