diff options
| -rw-r--r-- | examples/wayland/minimal-cpp/window.cpp | 2 | ||||
| -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 | ||||
| -rw-r--r-- | src/imports/compositor/compositor.pro | 3 |
5 files changed, 12 insertions, 5 deletions
diff --git a/examples/wayland/minimal-cpp/window.cpp b/examples/wayland/minimal-cpp/window.cpp index a23bba3ae..a66a33d58 100644 --- a/examples/wayland/minimal-cpp/window.cpp +++ b/examples/wayland/minimal-cpp/window.cpp @@ -75,7 +75,7 @@ static int sillyrandom(int range) { if (range <= 0) range = 200; - return QRandomGenerator::bounded(range); + return QRandomGenerator::global()->bounded(range); } void Window::paintGL() diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml index 9ed4acd24..77ed3ecd9 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 de6a9c8e7..ea90e6cdc 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 70f87e335..f57b8bb53 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 diff --git a/src/imports/compositor/compositor.pro b/src/imports/compositor/compositor.pro index 26cbe4744..12e5a5288 100644 --- a/src/imports/compositor/compositor.pro +++ b/src/imports/compositor/compositor.pro @@ -12,8 +12,7 @@ SOURCES += \ COMPOSITOR_QML_FILES += \ WaylandOutputWindow.qml \ - WaylandCursorItem.qml \ - qmldir + WaylandCursorItem.qml DEFINES += QT_WAYLAND_COMPOSITOR_QUICK |