Merge branch 'window_sized' into 'master'

[Compositor] implement requestWindowSize function. Fixes MER#1958 See merge request mer-core/lipstick!90
sailfishos · Dec 18, 2018 · 8f897ee · 8f897ee
2 parents f8fa384 + 26ed81e
commit 8f897ee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/compositor/lipstickcompositorwindow.cpp b/src/compositor/lipstickcompositorwindow.cpp
@@ -574,6 +574,14 @@ void LipstickCompositorWindow::setFocusOnTouch(bool focusOnTouch)
     emit focusOnTouchChanged();
 }
 
+void LipstickCompositorWindow::resize(const QSize &size)
+{
+    if (surface()->size() != size) {
+        surface()->requestSize(size);
+        emit resized();
+    }
+}
+
 static bool hwc_windowsurface_is_enabled()
 {
     if (!HwcRenderStage::isHwcEnabled())

diff --git a/src/compositor/lipstickcompositorwindow.h b/src/compositor/lipstickcompositorwindow.h
@@ -71,6 +71,7 @@ class LIPSTICK_EXPORT LipstickCompositorWindow : public QWaylandSurfaceItem
     bool focusOnTouch() const;
     void setFocusOnTouch(bool focusOnTouch);
 
+    Q_INVOKABLE void resize(const QSize &size);
 
 protected:
     void itemChange(ItemChange change, const ItemChangeData &data);
@@ -89,6 +90,7 @@ class LIPSTICK_EXPORT LipstickCompositorWindow : public QWaylandSurfaceItem
     void mouseRegionBoundsChanged();
     void committed();
     void focusOnTouchChanged();
+    void resized();
 
 private slots:
     void handleTouchCancel();