diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-15 09:11:47 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-15 09:11:47 +0100 |
| commit | cdcd6e5b729b64bef35faf293cff6731cd9eb832 (patch) | |
| tree | 4c4ea9c484f66e2280488fb474fee4f798cb9502 | |
| parent | 3ae8e08df33e017f5be91b68118093776c46788c (diff) | |
| parent | bfd08f5ebd33e452c08595e5811698a16d3166fa (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Ieb5a74f4741834a62cb1db03de2bb23eb060be74
| -rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.cpp | 1 | ||||
| -rw-r--r-- | src/compositor/compositor_api/qwaylandoutput.cpp | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index 00f3d83f0..99b484e20 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -199,6 +199,7 @@ void QWaylandCompositorPrivate::init() if (!autoSocketName) qFatal("Fatal: Failed to open server socket\n"); socket_name = autoSocketName; + emit q->socketNameChanged(socket_name); } loop = wl_display_get_event_loop(display); diff --git a/src/compositor/compositor_api/qwaylandoutput.cpp b/src/compositor/compositor_api/qwaylandoutput.cpp index 522de08e8..77d3dc1a9 100644 --- a/src/compositor/compositor_api/qwaylandoutput.cpp +++ b/src/compositor/compositor_api/qwaylandoutput.cpp @@ -529,6 +529,8 @@ void QWaylandOutput::setCurrentMode(const QWaylandOutputMode &mode) Q_EMIT currentModeChanged(); Q_EMIT geometryChanged(); + if (!d->availableGeometry.isValid()) + emit availableGeometryChanged(); d->sendModesInfo(); } @@ -938,6 +940,9 @@ void QWaylandOutput::handleSetWidth(int newWidth) QWaylandOutputMode mode = d->modes.at(d->currentMode); mode.setWidth(newWidth * d->window->devicePixelRatio()); d->modes.replace(d->currentMode, mode); + emit geometryChanged(); + if (!d->availableGeometry.isValid()) + emit availableGeometryChanged(); d->sendModesInfo(); } else { // We didn't add a mode during the initialization because the window @@ -968,6 +973,9 @@ void QWaylandOutput::handleSetHeight(int newHeight) QWaylandOutputMode mode = d->modes.at(d->currentMode); mode.setHeight(newHeight * d->window->devicePixelRatio()); d->modes.replace(d->currentMode, mode); + emit geometryChanged(); + if (!d->availableGeometry.isValid()) + emit availableGeometryChanged(); d->sendModesInfo(); } else { // We didn't add a mode during the initialization because the window |