yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use SurfaceInterface::boundingRect()

Browse source 
Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D27831
This commit is contained in:
Vlad Zahorodnii 2020-03-04 14:12:23 +02:00
parent 9cce7f8686
commit 29fa85eed1
1 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
xdgshellclient.cpp
View file

@ -47,7 +47,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KWayland/Server/server_decoration_interface.h> #include <KWayland/Server/server_decoration_interface.h>
#include <KWayland/Server/server_decoration_palette_interface.h> #include <KWayland/Server/server_decoration_palette_interface.h>
#include <KWayland/Server/shadow_interface.h> #include <KWayland/Server/shadow_interface.h>
#include <KWayland/Server/subcompositor_interface.h>
#include <KWayland/Server/surface_interface.h> #include <KWayland/Server/surface_interface.h>
#include <KWayland/Server/xdgdecoration_interface.h> #include <KWayland/Server/xdgdecoration_interface.h>
@ -320,28 +319,9 @@ QPoint XdgShellClient::clientContentPos() const
return -1 * clientPos(); return -1 * clientPos();
} }
static QRect subSurfaceTreeRect(const SurfaceInterface *surface, const QPoint &position = QPoint())
{
QRect rect(position, surface->size());
const QList<QPointer<SubSurfaceInterface>> subSurfaces = surface->childSubSurfaces();
for (const QPointer<SubSurfaceInterface> &subSurface : subSurfaces) {
if (Q_UNLIKELY(!subSurface)) {
continue;
}
const SurfaceInterface *child = subSurface->surface();
if (Q_UNLIKELY(!child)) {
continue;
}
rect |= subSurfaceTreeRect(child, position + subSurface->position());
}
return rect;
}
QSize XdgShellClient::clientSize() const QSize XdgShellClient::clientSize() const
{ {
const QRect boundingRect = subSurfaceTreeRect(surface()); const QRect boundingRect = surface()->boundingRect();
return m_windowGeometry.size().boundedTo(boundingRect.size()); return m_windowGeometry.size().boundedTo(boundingRect.size());
} }
@ -1321,7 +1301,7 @@ void XdgShellClient::handleCommitted()
} }
if (!m_hasWindowGeometry) { if (!m_hasWindowGeometry) {
m_windowGeometry = subSurfaceTreeRect(surface()); m_windowGeometry = surface()->boundingRect();
} }
updatePendingGeometry(); updatePendingGeometry();