From 02d7badd15601e52547e2f3e1c594ceede0a0455 Mon Sep 17 00:00:00 2001 From: davc0n Date: Fri, 25 Apr 2025 02:37:12 +0200 Subject: workspaces: refactor class member vars (#10167) --- src/protocols/AlphaModifier.cpp | 6 +++--- src/protocols/HyprlandSurface.cpp | 8 ++++---- src/protocols/PointerConstraints.cpp | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/protocols') diff --git a/src/protocols/AlphaModifier.cpp b/src/protocols/AlphaModifier.cpp index 60037632..3fea51fe 100644 --- a/src/protocols/AlphaModifier.cpp +++ b/src/protocols/AlphaModifier.cpp @@ -33,9 +33,9 @@ void CAlphaModifier::setResource(SP resource) { listeners.surfaceCommitted = m_pSurface->events.commit.registerListener([this](std::any data) { auto surface = CWLSurface::fromResource(m_pSurface.lock()); - if (surface && surface->m_fAlphaModifier != m_fAlpha) { - surface->m_fAlphaModifier = m_fAlpha; - auto box = surface->getSurfaceBoxGlobal(); + if (surface && surface->m_alphaModifier != m_fAlpha) { + surface->m_alphaModifier = m_fAlpha; + auto box = surface->getSurfaceBoxGlobal(); if (box.has_value()) g_pHyprRenderer->damageBox(*box); diff --git a/src/protocols/HyprlandSurface.cpp b/src/protocols/HyprlandSurface.cpp index 8b65f0fa..cdf6d722 100644 --- a/src/protocols/HyprlandSurface.cpp +++ b/src/protocols/HyprlandSurface.cpp @@ -54,10 +54,10 @@ void CHyprlandSurface::setResource(SP resource) { listeners.surfaceCommitted = m_pSurface->events.commit.registerListener([this](std::any data) { auto surface = CWLSurface::fromResource(m_pSurface.lock()); - if (surface && (surface->m_fOverallOpacity != m_fOpacity || m_bVisibleRegionChanged)) { - surface->m_fOverallOpacity = m_fOpacity; - surface->m_visibleRegion = m_visibleRegion; - auto box = surface->getSurfaceBoxGlobal(); + if (surface && (surface->m_overallOpacity != m_fOpacity || m_bVisibleRegionChanged)) { + surface->m_overallOpacity = m_fOpacity; + surface->m_visibleRegion = m_visibleRegion; + auto box = surface->getSurfaceBoxGlobal(); if (box.has_value()) g_pHyprRenderer->damageBox(*box); diff --git a/src/protocols/PointerConstraints.cpp b/src/protocols/PointerConstraints.cpp index b4868b56..c25dfdee 100644 --- a/src/protocols/PointerConstraints.cpp +++ b/src/protocols/PointerConstraints.cpp @@ -75,12 +75,12 @@ CPointerConstraint::~CPointerConstraint() { }); if (pHLSurface) - pHLSurface->m_pConstraint.reset(); + pHLSurface->m_constraint.reset(); } void CPointerConstraint::sharedConstructions() { if (pHLSurface) { - listeners.destroySurface = pHLSurface->events.destroy.registerListener([this](std::any d) { + listeners.destroySurface = pHLSurface->m_events.destroy.registerListener([this](std::any d) { pHLSurface.reset(); if (active) deactivate(); -- cgit v1.2.3