From 57b5657585783b5db75479e7eea45b41f833c60d Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 9 Jun 2025 11:41:50 +0800 Subject: [PATCH] fix: layershell calcular in x11 emulation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Log: fix bug 305717 系统缩放调整到125%，最大化应用窗口后会被任务栏覆盖 --- frame/layershell/x11dlayershellemulation.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/frame/layershell/x11dlayershellemulation.cpp b/frame/layershell/x11dlayershellemulation.cpp index 3c489dc09..62f60c891 100644 --- a/frame/layershell/x11dlayershellemulation.cpp +++ b/frame/layershell/x11dlayershellemulation.cpp @@ -172,10 +172,11 @@ void LayerShellEmulation::onExclusionZoneChanged() } else if ((anchors == DLayerShellWindow::AnchorRight) || (anchors ^ DLayerShellWindow::AnchorRight) == (DLayerShellWindow::AnchorTop | DLayerShellWindow::AnchorBottom)) { int boundary = 0; for (auto screen : qApp->screens()) { - if (boundary < screen->geometry().right()) - boundary = screen->geometry().right(); + int right = screen->geometry().x()/scaleFactor + screen->geometry().width(); + if (boundary < right) + boundary = right; } - strut_partial.right = boundary - rect.right() + (m_dlayerShellWindow->exclusionZone()) * scaleFactor; + strut_partial.right = (boundary - rect.right() + m_dlayerShellWindow->exclusionZone()) * scaleFactor; strut_partial.right_start_y = rect.y(); strut_partial.right_end_y = rect.y() + m_window->height(); } else if ((anchors == DLayerShellWindow::AnchorTop) || (anchors ^ DLayerShellWindow::AnchorTop) == (DLayerShellWindow::AnchorLeft | DLayerShellWindow::AnchorRight)) { @@ -188,10 +189,11 @@ void LayerShellEmulation::onExclusionZoneChanged() // but there is no issue. int boundary = 0; for (auto screen : qApp->screens()) { - if (boundary < screen->geometry().bottom()) - boundary = screen->geometry().bottom(); + int botton = screen->geometry().y()/scaleFactor + screen->geometry().height(); + if (boundary < botton) + boundary = botton; } - strut_partial.bottom = boundary - rect.bottom() + (m_dlayerShellWindow->exclusionZone()) * scaleFactor; + strut_partial.bottom = (boundary - rect.bottom() + m_dlayerShellWindow->exclusionZone()) * scaleFactor; strut_partial.bottom_start_x = rect.x(); strut_partial.bottom_end_x = rect.x() + m_window->width(); }