From 997fefbc1113323ed2bf5d782bdafc0d17532647 Mon Sep 17 00:00:00 2001 From: davc0n Date: Mon, 5 May 2025 23:44:49 +0200 Subject: render: refactor class member vars (#10292) * render: refactor class member vars * render: fix clang format --- src/desktop/LayerSurface.cpp | 2 +- src/desktop/WLSurface.cpp | 4 ++-- src/desktop/Window.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/desktop') diff --git a/src/desktop/LayerSurface.cpp b/src/desktop/LayerSurface.cpp index 61cca488..a5d9067a 100644 --- a/src/desktop/LayerSurface.cpp +++ b/src/desktop/LayerSurface.cpp @@ -74,7 +74,7 @@ CLayerSurface::~CLayerSurface() { if (m_surface) m_surface->unassign(); g_pHyprRenderer->makeEGLCurrent(); - std::erase_if(g_pHyprOpenGL->m_mLayerFramebuffers, [&](const auto& other) { return other.first.expired() || other.first.lock() == m_self.lock(); }); + std::erase_if(g_pHyprOpenGL->m_layerFramebuffers, [&](const auto& other) { return other.first.expired() || other.first.lock() == m_self.lock(); }); for (auto const& mon : g_pCompositor->m_realMonitors) { for (auto& lsl : mon->m_layerSurfaceLayers) { diff --git a/src/desktop/WLSurface.cpp b/src/desktop/WLSurface.cpp index 853f14c0..a7b9e620 100644 --- a/src/desktop/WLSurface.cpp +++ b/src/desktop/WLSurface.cpp @@ -143,8 +143,8 @@ void CWLSurface::destroy() { m_subsurfaceOwner = nullptr; m_inert = true; - if (g_pHyprRenderer && g_pHyprRenderer->m_sLastCursorData.surf && g_pHyprRenderer->m_sLastCursorData.surf->get() == this) - g_pHyprRenderer->m_sLastCursorData.surf.reset(); + if (g_pHyprRenderer && g_pHyprRenderer->m_lastCursorData.surf && g_pHyprRenderer->m_lastCursorData.surf->get() == this) + g_pHyprRenderer->m_lastCursorData.surf.reset(); m_resource.reset(); diff --git a/src/desktop/Window.cpp b/src/desktop/Window.cpp index a8fcf3a1..6e6e51a1 100644 --- a/src/desktop/Window.cpp +++ b/src/desktop/Window.cpp @@ -126,7 +126,7 @@ CWindow::~CWindow() { return; g_pHyprRenderer->makeEGLCurrent(); - std::erase_if(g_pHyprOpenGL->m_mWindowFramebuffers, [&](const auto& other) { return other.first.expired() || other.first.get() == this; }); + std::erase_if(g_pHyprOpenGL->m_windowFramebuffers, [&](const auto& other) { return other.first.expired() || other.first.get() == this; }); } SBoxExtents CWindow::getFullWindowExtents() { @@ -1160,7 +1160,7 @@ bool CWindow::opaque() { return false; if (m_isX11 && m_xwaylandSurface && m_xwaylandSurface->surface && m_xwaylandSurface->surface->m_current.texture) - return m_xwaylandSurface->surface->m_current.texture->m_bOpaque; + return m_xwaylandSurface->surface->m_current.texture->m_opaque; if (!m_wlSurface->resource() || !m_wlSurface->resource()->m_current.texture) return false; @@ -1170,7 +1170,7 @@ bool CWindow::opaque() { if (EXTENTS.w >= m_xdgSurface->m_surface->m_current.bufferSize.x && EXTENTS.h >= m_xdgSurface->m_surface->m_current.bufferSize.y) return true; - return m_wlSurface->resource()->m_current.texture->m_bOpaque; + return m_wlSurface->resource()->m_current.texture->m_opaque; } float CWindow::rounding() { -- cgit v1.2.3