summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/compositor/compositor_api/qwaylandsurface.cpp8
-rw-r--r--src/compositor/compositor_api/qwaylandsurface.h5
-rw-r--r--src/compositor/compositor_api/qwaylandsurfaceitem.cpp2
3 files changed, 4 insertions, 11 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp
index a51e1901f..88b68ebd1 100644
--- a/src/compositor/compositor_api/qwaylandsurface.cpp
+++ b/src/compositor/compositor_api/qwaylandsurface.cpp
@@ -149,13 +149,7 @@ QSize QWaylandSurface::size() const
return d->surface->size();
}
-void QWaylandSurface::setSize(const QSize &size)
-{
- Q_D(QWaylandSurface);
- d->surface->setSize(size);
-}
-
-void QWaylandSurface::sendConfigure(const QSize &size)
+void QWaylandSurface::requestSize(const QSize &size)
{
Q_D(QWaylandSurface);
if (d->surface->shellSurface())
diff --git a/src/compositor/compositor_api/qwaylandsurface.h b/src/compositor/compositor_api/qwaylandsurface.h
index b4f786b88..308e8d546 100644
--- a/src/compositor/compositor_api/qwaylandsurface.h
+++ b/src/compositor/compositor_api/qwaylandsurface.h
@@ -73,7 +73,7 @@ class Q_COMPOSITOR_EXPORT QWaylandSurface : public QObject
{
Q_OBJECT
Q_DECLARE_PRIVATE(QWaylandSurface)
- Q_PROPERTY(QSize size READ size WRITE setSize NOTIFY sizeChanged)
+ Q_PROPERTY(QSize size READ size NOTIFY sizeChanged)
Q_PROPERTY(QPointF pos READ pos WRITE setPos NOTIFY posChanged)
Q_PROPERTY(QWaylandSurface::WindowFlags windowFlags READ windowFlags NOTIFY windowFlagsChanged)
Q_PROPERTY(Qt::ScreenOrientation contentOrientation READ contentOrientation NOTIFY contentOrientationChanged)
@@ -113,8 +113,7 @@ public:
QPointF pos() const;
void setPos(const QPointF &pos);
QSize size() const;
- void setSize(const QSize &size);
- void sendConfigure(const QSize &size);
+ Q_INVOKABLE void requestSize(const QSize &size);
Qt::ScreenOrientations orientationUpdateMask() const;
Qt::ScreenOrientation contentOrientation() const;
diff --git a/src/compositor/compositor_api/qwaylandsurfaceitem.cpp b/src/compositor/compositor_api/qwaylandsurfaceitem.cpp
index 980cd37f5..dde6848b1 100644
--- a/src/compositor/compositor_api/qwaylandsurfaceitem.cpp
+++ b/src/compositor/compositor_api/qwaylandsurfaceitem.cpp
@@ -333,7 +333,7 @@ void QWaylandSurfaceItem::updateSize()
void QWaylandSurfaceItem::updateSurfaceSize()
{
if (m_resizeSurfaceToItem) {
- m_surface->sendConfigure(QSize(width(), height()));
+ m_surface->requestSize(QSize(width(), height()));
}
}