hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-23 10:05:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

force unmap on direct destroy

Browse source
This commit is contained in:
vaxerski 2022-07-25 18:38:40 +02:00
parent e2594c79cc
commit b1d3a1deea
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/events/Layers.cpp
View file

@ -67,10 +67,15 @@ void Events::listener_destroyLayerSurface(void* owner, void* data) {
Debug::log(WARN, "Layersurface destroyed on an invalid monitor (removed?)"); Debug::log(WARN, "Layersurface destroyed on an invalid monitor (removed?)");
if (!layersurface->fadingOut && PMONITOR) { if (!layersurface->fadingOut && PMONITOR) {
Debug::log(LOG, "Removing LayerSurface that wasn't mapped."); if (layersurface->mapped) {
layersurface->alpha.setValueAndWarp(0.f); Debug::log(LOG, "Forcing an unmap of a LS that did a straight destroy!");
layersurface->fadingOut = true; listener_unmapLayerSurface(layersurface, nullptr);
g_pCompositor->m_vSurfacesFadingOut.push_back(layersurface); } else {
Debug::log(LOG, "Removing LayerSurface that wasn't mapped.");
layersurface->alpha.setValueAndWarp(0.f);
layersurface->fadingOut = true;
g_pCompositor->m_vSurfacesFadingOut.push_back(layersurface);
}
} }
layersurface->noProcess = true; layersurface->noProcess = true;
@ -101,6 +106,7 @@ void Events::listener_mapLayerSurface(void* owner, void* data) {
Debug::log(LOG, "LayerSurface %x mapped", layersurface->layerSurface); Debug::log(LOG, "LayerSurface %x mapped", layersurface->layerSurface);
layersurface->layerSurface->mapped = true; layersurface->layerSurface->mapped = true;
layersurface->mapped = true;
// fix if it changed its mon // fix if it changed its mon
const auto PMONITOR = g_pCompositor->getMonitorFromOutput(layersurface->layerSurface->output); const auto PMONITOR = g_pCompositor->getMonitorFromOutput(layersurface->layerSurface->output);
@ -158,6 +164,8 @@ void Events::listener_unmapLayerSurface(void* owner, void* data) {
g_pHyprOpenGL->makeLayerSnapshot(layersurface); g_pHyprOpenGL->makeLayerSnapshot(layersurface);
layersurface->alpha = 0.f; layersurface->alpha = 0.f;
layersurface->mapped = false;
layersurface->fadingOut = true; layersurface->fadingOut = true;
g_pCompositor->m_vSurfacesFadingOut.push_back(layersurface); g_pCompositor->m_vSurfacesFadingOut.push_back(layersurface);

2
src/helpers/WLClasses.hpp
View file

@ -23,6 +23,8 @@ struct SLayerSurface {
Vector2D position; Vector2D position;
zwlr_layer_shell_v1_layer layer; zwlr_layer_shell_v1_layer layer;
bool mapped = false;
int monitorID = -1; int monitorID = -1;
std::string szNamespace = ""; std::string szNamespace = "";