summaryrefslogtreecommitdiff
path: root/src/render
diff options
context:
space:
mode:
authordavc0n <dconti.dev@gmail.com>2025-05-02 17:07:20 +0200
committerGitHub <noreply@github.com>2025-05-02 17:07:20 +0200
commitce821294e21978cadf4c3facbeec421b245ea2c9 (patch)
treeaa90efb5251160cd1ed37fc9443f596f80f6dd96 /src/render
parent6f174a9e0892aab5c4c17a7da9be7f92bcdcebec (diff)
managers: refactor class member vars (#10242)
Diffstat (limited to 'src/render')
-rw-r--r--src/render/decorations/CHyprGroupBarDecoration.cpp8
-rw-r--r--src/render/pass/Pass.cpp14
2 files changed, 11 insertions, 11 deletions
diff --git a/src/render/decorations/CHyprGroupBarDecoration.cpp b/src/render/decorations/CHyprGroupBarDecoration.cpp
index bb7383b3..aec84575 100644
--- a/src/render/decorations/CHyprGroupBarDecoration.cpp
+++ b/src/render/decorations/CHyprGroupBarDecoration.cpp
@@ -149,7 +149,7 @@ void CHyprGroupBarDecoration::draw(PHLMONITOR pMonitor, float const& a) {
rect.scale(pMonitor->m_scale).round();
- const bool GROUPLOCKED = m_pWindow->getGroupHead()->m_groupData.locked || g_pKeybindManager->m_bGroupsLocked;
+ const bool GROUPLOCKED = m_pWindow->getGroupHead()->m_groupData.locked || g_pKeybindManager->m_groupsLocked;
const auto* const PCOLACTIVE = GROUPLOCKED ? GROUPCOLACTIVELOCKED : GROUPCOLACTIVE;
const auto* const PCOLINACTIVE = GROUPLOCKED ? GROUPCOLINACTIVELOCKED : GROUPCOLINACTIVE;
@@ -398,10 +398,10 @@ bool CHyprGroupBarDecoration::onBeginWindowDragOnDeco(const Vector2D& pos) {
// hack
g_pLayoutManager->getCurrentLayout()->onWindowRemoved(pWindow);
if (!pWindow->m_isFloating) {
- const bool GROUPSLOCKEDPREV = g_pKeybindManager->m_bGroupsLocked;
- g_pKeybindManager->m_bGroupsLocked = true;
+ const bool GROUPSLOCKEDPREV = g_pKeybindManager->m_groupsLocked;
+ g_pKeybindManager->m_groupsLocked = true;
g_pLayoutManager->getCurrentLayout()->onWindowCreated(pWindow);
- g_pKeybindManager->m_bGroupsLocked = GROUPSLOCKEDPREV;
+ g_pKeybindManager->m_groupsLocked = GROUPSLOCKEDPREV;
}
g_pInputManager->m_currentlyDraggedWindow = pWindow;
diff --git a/src/render/pass/Pass.cpp b/src/render/pass/Pass.cpp
index 65d0ee65..8897be33 100644
--- a/src/render/pass/Pass.cpp
+++ b/src/render/pass/Pass.cpp
@@ -238,19 +238,19 @@ void CRenderPass::renderDebugData() {
offsets[surface.get()] += texture->m_vSize.y;
};
- renderHLSurface(debugData.keyboardFocusText, g_pSeatManager->state.keyboardFocus.lock(), Colors::PURPLE.modifyA(0.1F));
- renderHLSurface(debugData.pointerFocusText, g_pSeatManager->state.pointerFocus.lock(), Colors::ORANGE.modifyA(0.1F));
+ renderHLSurface(debugData.keyboardFocusText, g_pSeatManager->m_state.keyboardFocus.lock(), Colors::PURPLE.modifyA(0.1F));
+ renderHLSurface(debugData.pointerFocusText, g_pSeatManager->m_state.pointerFocus.lock(), Colors::ORANGE.modifyA(0.1F));
if (g_pCompositor->m_lastWindow)
renderHLSurface(debugData.lastWindowText, g_pCompositor->m_lastWindow->m_wlSurface->resource(), Colors::LIGHT_BLUE.modifyA(0.1F));
- if (g_pSeatManager->state.pointerFocus) {
- if (g_pSeatManager->state.pointerFocus->current.input.intersect(CBox{{}, g_pSeatManager->state.pointerFocus->current.size}).getExtents().size() !=
- g_pSeatManager->state.pointerFocus->current.size) {
- auto hlSurface = CWLSurface::fromResource(g_pSeatManager->state.pointerFocus.lock());
+ if (g_pSeatManager->m_state.pointerFocus) {
+ if (g_pSeatManager->m_state.pointerFocus->current.input.intersect(CBox{{}, g_pSeatManager->m_state.pointerFocus->current.size}).getExtents().size() !=
+ g_pSeatManager->m_state.pointerFocus->current.size) {
+ auto hlSurface = CWLSurface::fromResource(g_pSeatManager->m_state.pointerFocus.lock());
if (hlSurface) {
auto BOX = hlSurface->getSurfaceBoxGlobal();
if (BOX) {
- auto region = g_pSeatManager->state.pointerFocus->current.input.copy()
+ auto region = g_pSeatManager->m_state.pointerFocus->current.input.copy()
.scale(g_pHyprOpenGL->m_RenderData.pMonitor->m_scale)
.translate(BOX->pos() - g_pHyprOpenGL->m_RenderData.pMonitor->m_position);
g_pHyprOpenGL->renderRectWithDamage(box, CHyprColor{0.8F, 0.8F, 0.2F, 0.4F}, region);