From 920353370bba555010506a1c0b204675c60362fe Mon Sep 17 00:00:00 2001 From: Vaxry <43317083+vaxerski@users.noreply.github.com> Date: Mon, 8 Dec 2025 15:04:40 +0000 Subject: desktop: cleanup, unify desktop elements as views (#12563) --- src/protocols/ToplevelExport.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/protocols/ToplevelExport.cpp') diff --git a/src/protocols/ToplevelExport.cpp b/src/protocols/ToplevelExport.cpp index c66c1f2b..9d9d16be 100644 --- a/src/protocols/ToplevelExport.cpp +++ b/src/protocols/ToplevelExport.cpp @@ -372,9 +372,9 @@ bool CToplevelExportFrame::shouldOverlayCursor() const { if (!pointerSurfaceResource) return false; - auto pointerSurface = CWLSurface::fromResource(pointerSurfaceResource); + auto pointerSurface = Desktop::View::CWLSurface::fromResource(pointerSurfaceResource); - return pointerSurface && pointerSurface->getWindow() == m_window; + return pointerSurface && Desktop::View::CWindow::fromView(pointerSurface->view()) == m_window; } bool CToplevelExportFrame::good() { @@ -382,7 +382,11 @@ bool CToplevelExportFrame::good() { } CToplevelExportProtocol::CToplevelExportProtocol(const wl_interface* iface, const int& ver, const std::string& name) : IWaylandProtocol(iface, ver, name) { - ; + static auto P1 = g_pHookSystem->hookDynamic("closeWindow", [this](void* self, SCallbackInfo& info, std::any data) { + auto window = std::any_cast(data); + + onWindowUnmap(window); + }); } void CToplevelExportProtocol::bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id) { -- cgit v1.2.3