summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/compositor/compositor_api/qwaylandcompositor.cpp1
-rw-r--r--src/compositor/compositor_api/qwaylandoutput.cpp8
-rw-r--r--src/imports/compositor/compositor.pro3
3 files changed, 10 insertions, 2 deletions
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