diff options
| author | vaxerski <vaxry@vaxry.net> | 2023-06-03 12:20:23 +0200 |
|---|---|---|
| committer | vaxerski <vaxry@vaxry.net> | 2023-06-03 12:20:28 +0200 |
| commit | 147e962370069e6e3ec8054ef4243fc3fd69c9e8 (patch) | |
| tree | d19ba0103a7a60803e4aa90224273eae7ccfff2b /src/events/Layers.cpp | |
| parent | d7db7040d45a897adc598c3ba2e4b795f7e2a9b5 (diff) | |
deps: update wlroots
Diffstat (limited to 'src/events/Layers.cpp')
| -rw-r--r-- | src/events/Layers.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/events/Layers.cpp b/src/events/Layers.cpp index 88f9a70b..bc01bc5e 100644 --- a/src/events/Layers.cpp +++ b/src/events/Layers.cpp @@ -44,8 +44,8 @@ void Events::listener_newLayerSurface(wl_listener* listener, void* data) { layerSurface->hyprListener_commitLayerSurface.initCallback(&WLRLAYERSURFACE->surface->events.commit, &Events::listener_commitLayerSurface, layerSurface, "layerSurface"); layerSurface->hyprListener_destroyLayerSurface.initCallback(&WLRLAYERSURFACE->events.destroy, &Events::listener_destroyLayerSurface, layerSurface, "layerSurface"); - layerSurface->hyprListener_mapLayerSurface.initCallback(&WLRLAYERSURFACE->events.map, &Events::listener_mapLayerSurface, layerSurface, "layerSurface"); - layerSurface->hyprListener_unmapLayerSurface.initCallback(&WLRLAYERSURFACE->events.unmap, &Events::listener_unmapLayerSurface, layerSurface, "layerSurface"); + layerSurface->hyprListener_mapLayerSurface.initCallback(&WLRLAYERSURFACE->surface->events.map, &Events::listener_mapLayerSurface, layerSurface, "layerSurface"); + layerSurface->hyprListener_unmapLayerSurface.initCallback(&WLRLAYERSURFACE->surface->events.unmap, &Events::listener_unmapLayerSurface, layerSurface, "layerSurface"); layerSurface->hyprListener_newPopup.initCallback(&WLRLAYERSURFACE->events.new_popup, &Events::listener_newPopup, layerSurface, "layerSurface"); layerSurface->layerSurface = WLRLAYERSURFACE; @@ -109,10 +109,9 @@ void Events::listener_mapLayerSurface(void* owner, void* data) { Debug::log(LOG, "LayerSurface %lx mapped", layersurface->layerSurface); - layersurface->layerSurface->mapped = true; - layersurface->mapped = true; - layersurface->keyboardExclusive = layersurface->layerSurface->current.keyboard_interactive; - layersurface->surface = layersurface->layerSurface->surface; + layersurface->mapped = true; + layersurface->keyboardExclusive = layersurface->layerSurface->current.keyboard_interactive; + layersurface->surface = layersurface->layerSurface->surface; // anim layersurface->alpha.setConfig(g_pConfigManager->getAnimationPropertyConfig("fadeIn")); @@ -204,9 +203,6 @@ void Events::listener_unmapLayerSurface(void* owner, void* data) { g_pCompositor->addToFadingOutSafe(layersurface); - if (layersurface->layerSurface->mapped) - layersurface->layerSurface->mapped = false; - const auto PMONITOR = g_pCompositor->getMonitorFromOutput(layersurface->layerSurface->output); const bool WASLASTFOCUS = g_pCompositor->m_pLastFocus == layersurface->layerSurface->surface; |
