cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

protocols/subcompositor: fix subsurface sorting (#11136)

Browse source
This commit is contained in:
Vaxry 2025-07-20 19:42:40 +02:00 • committed by GitHub
parent bf1602d9f9
commit 462729d865
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 41 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/protocols/core/Compositor.cpp
View file

@ -555,6 +555,30 @@ SImageDescription CWLSurfaceResource::getPreferredImageDescription() {
return monitor ? monitor->m_imageDescription : g_pCompositor->getPreferredImageDescription();
}
void CWLSurfaceResource::sortSubsurfaces() {
std::ranges::sort(m_subsurfaces, [](const auto& a, const auto& b) { return a->m_zIndex < b->m_zIndex; });
// find the first non-negative index. We will preserve negativity: e.g. -2, -1, 1, 2
int firstNonNegative = -1;
for (size_t i = 0; i < m_subsurfaces.size(); ++i) {
if (m_subsurfaces.at(i)->m_zIndex >= 0) {
firstNonNegative = i;
break;
}
}
if (firstNonNegative == -1)
firstNonNegative = m_subsurfaces.size();
for (size_t i = firstNonNegative; i < m_subsurfaces.size(); ++i) {
m_subsurfaces.at(i)->m_zIndex = i - firstNonNegative;
}
for (int i = 0; i < firstNonNegative; ++i) {
m_subsurfaces.at(i)->m_zIndex = -firstNonNegative + i;
}
}
void CWLSurfaceResource::updateCursorShm(CRegion damage) {
if (damage.empty())
return;