From dc5cc15474813f48ca5754d0ac89ee90e437a07c Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Fri, 10 Jun 2022 15:18:30 +0200 Subject: [PATCH] find surfaces in reverse for focus --- src/Compositor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Compositor.cpp b/src/Compositor.cpp index a787855a..32ffab34 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -585,11 +585,11 @@ CWindow* CCompositor::getWindowForPopup(wlr_xdg_popup* popup) { } wlr_surface* CCompositor::vectorToLayerSurface(const Vector2D& pos, std::list* layerSurfaces, Vector2D* sCoords) { - for (auto& l : *layerSurfaces) { - if (l->fadingOut || (l->layerSurface && !l->layerSurface->mapped)) + for (auto it = layerSurfaces->rbegin(); it != layerSurfaces->rend(); it++) { + if ((*it)->fadingOut || !(*it)->layerSurface || ((*it)->layerSurface && !(*it)->layerSurface->mapped)) continue; - const auto SURFACEAT = wlr_layer_surface_v1_surface_at(l->layerSurface, pos.x - l->geometry.x, pos.y - l->geometry.y, &sCoords->x, &sCoords->y); + const auto SURFACEAT = wlr_layer_surface_v1_surface_at((*it)->layerSurface, pos.x - (*it)->geometry.x, pos.y - (*it)->geometry.y, &sCoords->x, &sCoords->y); if (SURFACEAT) return SURFACEAT;