From 005377eff7b62b674b6acdac8fbdb3d149bf132b Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Thu, 1 Oct 2020 14:33:31 +0300 Subject: [PATCH] Unify code that setups client connections in EffectsHandlerImpl Workspace::allClientList() returns all X11 and Wayland windows. So, we don't need the two separate code paths. --- effects.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/effects.cpp b/effects.cpp index ef93b83f2..5cd17d6f4 100644 --- a/effects.cpp +++ b/effects.cpp @@ -237,8 +237,12 @@ EffectsHandlerImpl::EffectsHandlerImpl(Compositor *compositor, Scene *scene) } // connect all clients - for (X11Client *c : ws->clientList()) { - setupClientConnections(c); + for (AbstractClient *client : ws->allClientList()) { + if (client->readyForPainting()) { + setupClientConnections(client); + } else { + connect(client, &Toplevel::windowShown, this, &EffectsHandlerImpl::slotClientShown); + } } for (Unmanaged *u : ws->unmanagedList()) { setupUnmanagedConnections(u); @@ -246,16 +250,7 @@ EffectsHandlerImpl::EffectsHandlerImpl(Compositor *compositor, Scene *scene) for (InternalClient *client : ws->internalClients()) { setupClientConnections(client); } - if (waylandServer()) { - const auto clients = waylandServer()->clients(); - for (AbstractClient *c : clients) { - if (c->readyForPainting()) { - setupClientConnections(c); - } else { - connect(c, &Toplevel::windowShown, this, &EffectsHandlerImpl::slotClientShown); - } - } - } + reconfigure(); }