diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:49:22 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:49:22 +0100 |
commit | b6ac922f1af207725e91fe5de0ea3ad0919d8026 (patch) | |
tree | 5a8abeaf4d634569fd40ed486af076a6c884f28d | |
parent | a2e252535af41372a6476211d60ca7198db4a1d1 (diff) | |
parent | 00390ccf893aa02c8f51e0887624455c7e8d111d (diff) | |
download | qtwayland-b6ac922f1af207725e91fe5de0ea3ad0919d8026.tar.gz |
Merge 5.10 into 5.10.0
Change-Id: Ieb3abe997b444fc46218cd2a1d00a5cfaf37f7b1
-rw-r--r-- | examples/wayland/pure-qml/qml/main.qml | 3 | ||||
-rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.cpp | 1 | ||||
-rw-r--r-- | src/compositor/compositor_api/qwaylandoutput.cpp | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml index 9ed4acd2..77ed3ecd 100644 --- a/examples/wayland/pure-qml/qml/main.qml +++ b/examples/wayland/pure-qml/qml/main.qml @@ -104,9 +104,8 @@ WaylandCompositor { } onPopupCreated: { var parentView = viewsBySurface[popup.parentXdgSurface.surface]; - var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": xdgSurface } ); + var item = chromeComponent.createObject(parentView, { "shellSurface": xdgSurface } ); viewsBySurface[xdgSurface.surface] = item; - //TODO: set popup position } } diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index 00f3d83f..99b484e2 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 522de08e..77d3dc1a 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 |