From 7c3d014f21a7ed19030c8c0f41104e87d492f9d6 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vladzzag@gmail.com>
Date: Thu, 26 Sep 2019 18:11:25 +0300
Subject: [PATCH] [wayland] Use setGeometry in resizeWithChecks

Summary:
Configure xdg-toplevel only through setGeometry method, so it's easier
to reason about how geometry is handled in XdgShellClient.

Reviewers: #kwin

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D24329
---
 xdgshellclient.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/xdgshellclient.cpp b/xdgshellclient.cpp
index 13b60ee546..36e49b4734 100644
--- a/xdgshellclient.cpp
+++ b/xdgshellclient.cpp
@@ -1259,7 +1259,6 @@ void XdgShellClient::handleCommitted()
 
 void XdgShellClient::resizeWithChecks(int w, int h, ForceGeometry_t force)
 {
-    Q_UNUSED(force)
     QRect area = workspace()->clientArea(WorkArea, this);
     // don't allow growing larger than workarea
     if (w > area.width()) {
@@ -1268,9 +1267,7 @@ void XdgShellClient::resizeWithChecks(int w, int h, ForceGeometry_t force)
     if (h > area.height()) {
         h = area.height();
     }
-    if (m_xdgShellSurface) {
-        m_xdgShellSurface->configure(xdgSurfaceStates(), QSize(w, h));
-    }
+    setGeometry(x(), y(), w, h, force);
 }
 
 void XdgShellClient::unmap()