Skip to content

fix: layershell calcular in x11 emulation #1149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Jun 10, 2025
Merged

fix: layershell calcular in x11 emulation #1149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions frame/layershell/x11dlayershellemulation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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();
}
Expand Down