From 86acdcf8b6056f088938c2892cca87baf292068d Mon Sep 17 00:00:00 2001 From: vaxerski Date: Wed, 1 Mar 2023 13:15:51 +0000 Subject: nuke unmanagedx11 vector --- src/events/Windows.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/events/Windows.cpp') diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp index 52791d6c..7c312b53 100644 --- a/src/events/Windows.cpp +++ b/src/events/Windows.cpp @@ -61,9 +61,6 @@ void Events::listener_mapWindow(void* owner, void* data) { if (g_pInputManager->m_bLastFocusOnLS) // waybar fix g_pInputManager->releaseAllMouseButtons(); - if (PWINDOW->m_iX11Type == 2) - g_pCompositor->moveUnmanagedX11ToWindows(PWINDOW); - // Set all windows tiled regardless of anything g_pXWaylandManager->setWindowStyleTiled(PWINDOW, WLR_EDGE_LEFT | WLR_EDGE_RIGHT | WLR_EDGE_TOP | WLR_EDGE_BOTTOM); @@ -985,8 +982,7 @@ void Events::listener_surfaceXWayland(wl_listener* listener, void* data) { if (XWSURFACE->parent) Debug::log(LOG, "Window parent data: %s at %x", XWSURFACE->parent->_class, XWSURFACE->parent); - const auto PNEWWINDOW = XWSURFACE->override_redirect ? g_pCompositor->m_dUnmanagedX11Windows.emplace_back(std::make_unique()).get() : - g_pCompositor->m_vWindows.emplace_back(std::make_unique()).get(); + const auto PNEWWINDOW = (CWindow*)g_pCompositor->m_vWindows.emplace_back(std::make_unique()).get(); PNEWWINDOW->m_uSurface.xwayland = XWSURFACE; PNEWWINDOW->m_iX11Type = XWSURFACE->override_redirect ? 2 : 1; -- cgit v1.2.3