diff options
author | vaxerski <[email protected]> | 2023-03-01 13:15:51 +0000 |
---|---|---|
committer | vaxerski <[email protected]> | 2023-03-01 13:15:51 +0000 |
commit | 86acdcf8b6056f088938c2892cca87baf292068d (patch) | |
tree | 1894134d71c4cb78bb08b23c6857464d517c64c9 /src/Compositor.cpp | |
parent | ea717731a41be907e9bfaa2c41a3f145452c7767 (diff) | |
download | Hyprland-86acdcf8b6056f088938c2892cca87baf292068d.tar.gz Hyprland-86acdcf8b6056f088938c2892cca87baf292068d.zip |
nuke unmanagedx11 vector
Diffstat (limited to 'src/Compositor.cpp')
-rw-r--r-- | src/Compositor.cpp | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 8aec26f8..14f1eba1 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -512,15 +512,6 @@ void CCompositor::removeWindowFromVectorSafe(CWindow* pWindow) { if (w->m_pX11Parent == pWindow) std::erase_if(m_vWindows, [&](std::unique_ptr<CWindow>& el) { return el.get() == w.get(); }); } - - for (auto& w : m_dUnmanagedX11Windows) { - if (w->m_pX11Parent == pWindow) - std::erase_if(m_dUnmanagedX11Windows, [&](std::unique_ptr<CWindow>& el) { return el.get() == w.get(); }); - } - } - - if (pWindow->m_bIsX11 && pWindow->m_iX11Type == 2) { - std::erase_if(m_dUnmanagedX11Windows, [&](std::unique_ptr<CWindow>& el) { return el.get() == pWindow; }); } std::erase_if(m_vWindows, [&](std::unique_ptr<CWindow>& el) { return el.get() == pWindow; }); @@ -533,11 +524,6 @@ bool CCompositor::windowExists(CWindow* pWindow) { return true; } - for (auto& u : m_dUnmanagedX11Windows) { - if (u.get() == pWindow) - return true; - } - return false; } @@ -1230,7 +1216,7 @@ void CCompositor::cleanupFadingOut(const int& monid) { if (!valid || !w->m_bFadingOut || w->m_fAlpha.fl() == 0.f) { if (valid && !w->m_bReadyToDelete) continue; - + std::erase_if(g_pHyprOpenGL->m_mWindowFramebuffers, [&](const auto& other) { return other.first == w; }); w->m_bFadingOut = false; removeWindowFromVectorSafe(w); @@ -1994,16 +1980,6 @@ void CCompositor::setWindowFullscreen(CWindow* pWindow, bool on, eFullscreenMode g_pConfigManager->ensureVRR(PMONITOR); } -void CCompositor::moveUnmanagedX11ToWindows(CWindow* pWindow) { - for (auto it = m_dUnmanagedX11Windows.begin(); it != m_dUnmanagedX11Windows.end(); it++) { - if (it->get() == pWindow) { - m_vWindows.emplace_back(std::move(*it)); - m_dUnmanagedX11Windows.erase(it); - return; - } - } -} - CWindow* CCompositor::getX11Parent(CWindow* pWindow) { if (!pWindow->m_bIsX11) return nullptr; |