mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-10 09:45:58 +01:00
compositor: minor cleanups for fading out layers
This commit is contained in:
parent
2e3dc17a7e
commit
f36c625e37
1 changed files with 9 additions and 2 deletions
|
@ -1425,12 +1425,16 @@ void CCompositor::cleanupFadingOut(const int& monid) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool layersDirty = false;
|
||||||
|
|
||||||
for (auto& lsr : m_vSurfacesFadingOut) {
|
for (auto& lsr : m_vSurfacesFadingOut) {
|
||||||
|
|
||||||
auto ls = lsr.lock();
|
auto ls = lsr.lock();
|
||||||
|
|
||||||
if (!ls)
|
if (!ls) {
|
||||||
|
layersDirty = true;
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (ls->monitorID != monid)
|
if (ls->monitorID != monid)
|
||||||
continue;
|
continue;
|
||||||
|
@ -1443,7 +1447,7 @@ void CCompositor::cleanupFadingOut(const int& monid) {
|
||||||
for (auto& m : m_vMonitors) {
|
for (auto& m : m_vMonitors) {
|
||||||
for (auto& lsl : m->m_aLayerSurfaceLayers) {
|
for (auto& lsl : m->m_aLayerSurfaceLayers) {
|
||||||
if (!lsl.empty() && std::find_if(lsl.begin(), lsl.end(), [&](auto& other) { return other == ls; }) != lsl.end()) {
|
if (!lsl.empty() && std::find_if(lsl.begin(), lsl.end(), [&](auto& other) { return other == ls; }) != lsl.end()) {
|
||||||
std::erase_if(lsl, [&](auto& other) { return other == ls; });
|
std::erase_if(lsl, [&](auto& other) { return other == ls || !other; });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1459,6 +1463,9 @@ void CCompositor::cleanupFadingOut(const int& monid) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (layersDirty)
|
||||||
|
std::erase_if(m_vSurfacesFadingOut, [](const auto& el) { return el.expired(); });
|
||||||
}
|
}
|
||||||
|
|
||||||
void CCompositor::addToFadingOutSafe(PHLLS pLS) {
|
void CCompositor::addToFadingOutSafe(PHLLS pLS) {
|
||||||
|
|
Loading…
Reference in a new issue