1 files changed, 4 insertions, 4 deletions
diff --git a/src/events/Events.cpp b/src/events/Events.cpp
index 24c51a07..6baaeebb 100644
--- a/src/events/Events.cpp
+++ b/src/events/Events.cpp
@@ -206,10 +206,8 @@ void Events::listener_mapWindow(wl_listener* listener, void* data) {
     PWINDOW->m_iMonitorID = PMONITOR->ID;
     PWINDOW->m_bMappedX11 = true;
 
-    // test
-    PWINDOW->m_vSize = PMONITOR->vecSize;
-    PWINDOW->m_vPosition = PMONITOR->vecPosition;
-    g_pXWaylandManager->setWindowSize(PWINDOW, PMONITOR->vecSize);
+    g_pLayoutManager->getCurrentLayout()->onWindowCreated(PWINDOW);
+    
     g_pCompositor->focusWindow(PWINDOW);
 
     Debug::log(LOG, "Map request dispatched.");
@@ -218,6 +216,8 @@ void Events::listener_mapWindow(wl_listener* listener, void* data) {
 void Events::listener_unmapWindow(wl_listener* listener, void* data) {
     CWindow* PWINDOW = wl_container_of(listener, PWINDOW, listen_unmapWindow);
 
+    g_pLayoutManager->getCurrentLayout()->onWindowRemoved(PWINDOW);
+
     g_pCompositor->removeWindowFromVectorSafe(PWINDOW);
 
     Debug::log(LOG, "Window %x unmapped", PWINDOW);