From 6a36c35d73e589a7672597ecc7596ea8b10068f1 Mon Sep 17 00:00:00 2001 From: Vlad Zagorodniy Date: Thu, 1 Nov 2018 13:10:48 +0200 Subject: [PATCH] Simplify transient initialization in Deleted Summary: AbstractClient::mainClients is quite generic, it can return either transientFor parent or group member parents. Test Plan: Existing tests still pass. Reviewers: #kwin, davidedmundson Reviewed By: #kwin, davidedmundson Subscribers: davidedmundson, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D16586 --- deleted.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/deleted.cpp b/deleted.cpp index fe2e4956e3..e6aee37737 100644 --- a/deleted.cpp +++ b/deleted.cpp @@ -125,6 +125,7 @@ void Deleted::copyToDeleted(Toplevel* c) m_modal = client->isModal(); m_mainClients = client->mainClients(); foreach (AbstractClient *c, m_mainClients) { + addTransientFor(c); connect(c, &AbstractClient::windowClosed, this, &Deleted::mainClientClosed); } m_fullscreen = client->isFullScreen(); @@ -137,20 +138,6 @@ void Deleted::copyToDeleted(Toplevel* c) const auto *x11Client = qobject_cast(client); m_wasGroupTransient = x11Client && x11Client->groupTransient(); - - if (m_wasGroupTransient) { - const auto members = x11Client->group()->members(); - for (Client *member : members) { - if (member != client) { - addTransientFor(member); - } - } - } else { - AbstractClient *transientFor = client->transientFor(); - if (transientFor != nullptr) { - addTransientFor(transientFor); - } - } } m_wasWaylandClient = qobject_cast(c) != nullptr;