mirror/Hyprland
3
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2026-02-04 15:25:44 +00:00
Code Issues Projects Releases Wiki Activity

desktop/popup: minor improvements

Browse Source
This commit is contained in:
Vaxry
2025-12-16 15:01:38 +00:00
parent 6e09eb2e6c
commit c5beecb2c3
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/desktop/view/Popup.cpp
View File

@ -68,7 +68,7 @@ eViewType CPopup::type() const {
}
bool CPopup::visible() const {
if (!m_mapped || !m_wlSurface->resource())
if ((!m_mapped || !m_wlSurface->resource()) && (!m_fadingOut || m_alpha->value() > 0.F))
return false;
if (!m_windowOwner.expired())
@ -129,7 +129,7 @@ void CPopup::initAllSignals() {
m_listeners.map = m_resource->m_surface->m_events.map.listen([this] { this->onMap(); });
m_listeners.unmap = m_resource->m_surface->m_events.unmap.listen([this] { this->onUnmap(); });
m_listeners.dismissed = m_resource->m_events.dismissed.listen([this] { this->onUnmap(); });
m_listeners.destroy = m_resource->m_surface->m_events.destroy.listen([this] { this->onDestroy(); });
m_listeners.destroy = m_resource->m_events.destroy.listen([this] { this->onDestroy(); });
m_listeners.commit = m_resource->m_surface->m_events.commit.listen([this] { this->onCommit(); });
m_listeners.newPopup = m_resource->m_surface->m_events.newPopup.listen([this](const auto& resource) { this->onNewPopup(resource); });
}
@ -150,6 +150,11 @@ void CPopup::onDestroy() {
m_children.clear();
m_wlSurface.reset();
m_listeners.map.reset();
m_listeners.unmap.reset();
m_listeners.commit.reset();
m_listeners.newPopup.reset();
if (m_fadingOut && m_alpha->isBeingAnimated()) {
Debug::log(LOG, "popup {:x}: skipping full destroy, animating", rc<uintptr_t>(this));
return;
@ -394,6 +399,8 @@ void CPopup::recheckChildrenRecursive() {
std::vector<WP<CPopup>> cpy;
std::ranges::for_each(m_children, [&cpy](const auto& el) { cpy.emplace_back(el); });
for (auto const& c : cpy) {
if (!c->visible())
continue;
c->onCommit(true);
c->recheckChildrenRecursive();
}