diff options
| author | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2022-10-14 20:46:32 +0100 |
|---|---|---|
| committer | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2022-10-14 20:46:32 +0100 |
| commit | 34cd8b125ad9f03ababd7789ebe12eac69e23227 (patch) | |
| tree | 5595368acdc5d1612c276350bf430a79667fe6dc /src/render | |
| parent | b0544dbfffb79e1aa043c7626fbcbc86b8ee9379 (diff) | |
rework focus system to be more safe and faster
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/OpenGL.cpp | 4 | ||||
| -rw-r--r-- | src/render/Renderer.cpp | 10 | ||||
| -rw-r--r-- | src/render/decorations/CHyprGroupBarDecoration.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/render/OpenGL.cpp b/src/render/OpenGL.cpp index e0cb28e2..70ba7121 100644 --- a/src/render/OpenGL.cpp +++ b/src/render/OpenGL.cpp @@ -642,7 +642,7 @@ void CHyprOpenGLImpl::preRender(CMonitor* pMonitor) { bool has = false; for (auto& w : g_pCompositor->m_vWindows) { - if (w->m_iWorkspaceID == pMonitor->activeWorkspace && w->m_bIsMapped && !w->m_bHidden && !w->m_bIsFloating) { + if (w->m_iWorkspaceID == pMonitor->activeWorkspace && w->m_bIsMapped && !w->isHidden() && !w->m_bIsFloating) { has = true; break; } @@ -685,7 +685,7 @@ void CHyprOpenGLImpl::preWindowPass() { bool hasWindows = false; for (auto& w : g_pCompositor->m_vWindows) { - if (w->m_iWorkspaceID == m_RenderData.pMonitor->activeWorkspace && !w->m_bHidden && w->m_bIsMapped && !w->m_bIsFloating) { + if (w->m_iWorkspaceID == m_RenderData.pMonitor->activeWorkspace && !w->isHidden() && w->m_bIsMapped && !w->m_bIsFloating) { hasWindows = true; break; } diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp index 13d2360b..71bfaab7 100644 --- a/src/render/Renderer.cpp +++ b/src/render/Renderer.cpp @@ -215,7 +215,7 @@ void CHyprRenderer::renderWorkspaceWithFullscreenWindow(CMonitor* pMonitor, CWor } void CHyprRenderer::renderWindow(CWindow* pWindow, CMonitor* pMonitor, timespec* time, bool decorate, eRenderPassMode mode) { - if (pWindow->m_bHidden) + if (pWindow->isHidden()) return; if (pWindow->m_bFadingOut) { @@ -383,7 +383,7 @@ void CHyprRenderer::renderAllClientsForMonitor(const int& ID, timespec* time) { // Non-floating main for (auto& w : g_pCompositor->m_vWindows) { - if (w->m_bHidden && !w->m_bIsMapped && !w->m_bFadingOut) + if (w->isHidden() && !w->m_bIsMapped && !w->m_bFadingOut) continue; if (w->m_bIsFloating) @@ -401,7 +401,7 @@ void CHyprRenderer::renderAllClientsForMonitor(const int& ID, timespec* time) { // Non-floating popup for (auto& w : g_pCompositor->m_vWindows) { - if (w->m_bHidden && !w->m_bIsMapped && !w->m_bFadingOut) + if (w->isHidden() && !w->m_bIsMapped && !w->m_bFadingOut) continue; if (w->m_bIsFloating) @@ -419,7 +419,7 @@ void CHyprRenderer::renderAllClientsForMonitor(const int& ID, timespec* time) { // floating on top for (auto& w : g_pCompositor->m_vWindows) { - if (w->m_bHidden && !w->m_bIsMapped && !w->m_bFadingOut) + if (w->isHidden() && !w->m_bIsMapped && !w->m_bFadingOut) continue; if (!w->m_bIsFloating) @@ -437,7 +437,7 @@ void CHyprRenderer::renderAllClientsForMonitor(const int& ID, timespec* time) { // and then special for (auto& w : g_pCompositor->m_vWindows) { - if (w->m_bHidden && !w->m_bIsMapped && !w->m_bFadingOut) + if (w->isHidden() && !w->m_bIsMapped && !w->m_bFadingOut) continue; if (w->m_iWorkspaceID != SPECIAL_WORKSPACE_ID) diff --git a/src/render/decorations/CHyprGroupBarDecoration.cpp b/src/render/decorations/CHyprGroupBarDecoration.cpp index eee96947..c3f9047e 100644 --- a/src/render/decorations/CHyprGroupBarDecoration.cpp +++ b/src/render/decorations/CHyprGroupBarDecoration.cpp @@ -67,7 +67,7 @@ void CHyprGroupBarDecoration::draw(CMonitor* pMonitor, float a, const Vector2D& // get how many bars we will draw int barsToDraw = m_dwGroupMembers.size(); - if (barsToDraw < 1 || m_pWindow->m_bHidden || !g_pCompositor->windowValidMapped(m_pWindow)) + if (barsToDraw < 1 || m_pWindow->isHidden() || !g_pCompositor->windowValidMapped(m_pWindow)) return; if (!m_pWindow->m_sSpecialRenderData.decorate) |
