From 9dae8ece712ab710a6ff36284b4be408c11526b4 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Fri, 25 Aug 2023 18:10:12 +0200 Subject: [PATCH] layout: use full box for visibility check of floating xdg Fixes #3069, if an xdg dialog pops up and is partially off bounds, just move it to the center. --- src/layout/IHyprLayout.cpp | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/layout/IHyprLayout.cpp b/src/layout/IHyprLayout.cpp index fd40e979..92191732 100644 --- a/src/layout/IHyprLayout.cpp +++ b/src/layout/IHyprLayout.cpp @@ -129,21 +129,11 @@ void IHyprLayout::onWindowCreatedFloating(CWindow* pWindow) { // check if it's visible on any monitor (only for XDG) bool visible = pWindow->m_bIsX11; - if (!pWindow->m_bIsX11) { - for (auto& m : g_pCompositor->m_vMonitors) { - if (VECINRECT(Vector2D(desiredGeometry.x, desiredGeometry.y), m->vecPosition.x, m->vecPosition.y, m->vecPosition.x + m->vecSize.x, - m->vecPosition.y + m->vecPosition.y) || - VECINRECT(Vector2D(desiredGeometry.x + desiredGeometry.width, desiredGeometry.y), m->vecPosition.x, m->vecPosition.y, m->vecPosition.x + m->vecSize.x, - m->vecPosition.y + m->vecPosition.y) || - VECINRECT(Vector2D(desiredGeometry.x, desiredGeometry.y + desiredGeometry.height), m->vecPosition.x, m->vecPosition.y, m->vecPosition.x + m->vecSize.x, - m->vecPosition.y + m->vecPosition.y) || - VECINRECT(Vector2D(desiredGeometry.x + desiredGeometry.width, desiredGeometry.y + desiredGeometry.height), m->vecPosition.x, m->vecPosition.y, - m->vecPosition.x + m->vecSize.x, m->vecPosition.y + m->vecPosition.y)) { - - visible = true; - break; - } - } + if (!visible) { + visible = g_pCompositor->isPointOnAnyMonitor(Vector2D(desiredGeometry.x, desiredGeometry.y)) && + g_pCompositor->isPointOnAnyMonitor(Vector2D(desiredGeometry.x + desiredGeometry.width, desiredGeometry.y)) && + g_pCompositor->isPointOnAnyMonitor(Vector2D(desiredGeometry.x, desiredGeometry.y + desiredGeometry.height)) && + g_pCompositor->isPointOnAnyMonitor(Vector2D(desiredGeometry.x + desiredGeometry.width, desiredGeometry.y + desiredGeometry.height)); } // TODO: detect a popup in a more consistent way.