From 11a7ad55b7268debb6d3f4aa896f8f8ad9512cd3 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Mon, 27 Feb 2023 19:54:53 +0000 Subject: [PATCH] add offset to bordersplusplus --- borders-plus-plus/borderDeco.cpp | 63 ++++++++++++++------------------ 1 file changed, 28 insertions(+), 35 deletions(-) diff --git a/borders-plus-plus/borderDeco.cpp b/borders-plus-plus/borderDeco.cpp index 81b118e..c11f710 100644 --- a/borders-plus-plus/borderDeco.cpp +++ b/borders-plus-plus/borderDeco.cpp @@ -1,28 +1,24 @@ #include "borderDeco.hpp" -#include "globals.hpp" + #include #include +#include "globals.hpp" + CBordersPlusPlus::CBordersPlusPlus(CWindow* pWindow) { m_pWindow = pWindow; m_vLastWindowPos = pWindow->m_vRealPosition.vec(); m_vLastWindowSize = pWindow->m_vRealSize.vec(); } -CBordersPlusPlus::~CBordersPlusPlus() { - damageEntire(); -} +CBordersPlusPlus::~CBordersPlusPlus() { damageEntire(); } -SWindowDecorationExtents CBordersPlusPlus::getWindowDecorationExtents() { - return m_seExtents; -} +SWindowDecorationExtents CBordersPlusPlus::getWindowDecorationExtents() { return m_seExtents; } void CBordersPlusPlus::draw(CMonitor* pMonitor, float a, const Vector2D& offset) { - if (!g_pCompositor->windowValidMapped(m_pWindow)) - return; + if (!g_pCompositor->windowValidMapped(m_pWindow)) return; - if (!m_pWindow->m_sSpecialRenderData.decorate) - return; + if (!m_pWindow->m_sSpecialRenderData.decorate) return; static auto* const PCOLOR1 = &HyprlandAPI::getConfigValue(PHANDLE, "plugin:borders-plus-plus:col.border_1")->intValue; static auto* const PCOLOR2 = &HyprlandAPI::getConfigValue(PHANDLE, "plugin:borders-plus-plus:col.border_2")->intValue; @@ -30,28 +26,28 @@ void CBordersPlusPlus::draw(CMonitor* pMonitor, float a, const Vector2D& offset) static auto* const PROUNDING = &HyprlandAPI::getConfigValue(PHANDLE, "decoration:rounding")->intValue; static auto* const PBORDERSIZE = &HyprlandAPI::getConfigValue(PHANDLE, "general:border_size")->intValue; - if (*PBORDERS < 1) - return; + if (*PBORDERS < 1) return; - const auto ROUNDING = !m_pWindow->m_sSpecialRenderData.rounding ? - 0 : - (m_pWindow->m_sAdditionalConfigData.rounding.toUnderlying() == -1 ? *PROUNDING : m_pWindow->m_sAdditionalConfigData.rounding.toUnderlying()); + const auto ROUNDING = !m_pWindow->m_sSpecialRenderData.rounding ? 0 + : (m_pWindow->m_sAdditionalConfigData.rounding.toUnderlying() == -1 + ? *PROUNDING + : m_pWindow->m_sAdditionalConfigData.rounding.toUnderlying()); // draw the border - wlr_box fullBox = { (int)(m_vLastWindowPos.x - *PBORDERSIZE), (int)(m_vLastWindowPos.y - *PBORDERSIZE), (int)(m_vLastWindowSize.x + 2.0 * *PBORDERSIZE), (int)(m_vLastWindowSize.y + 2.0 * *PBORDERSIZE) }; + wlr_box fullBox = {(int)(m_vLastWindowPos.x - *PBORDERSIZE + offset.x), (int)(m_vLastWindowPos.y - *PBORDERSIZE + offset.y), + (int)(m_vLastWindowSize.x + 2.0 * *PBORDERSIZE), (int)(m_vLastWindowSize.y + 2.0 * *PBORDERSIZE)}; fullBox.x -= pMonitor->vecPosition.x; fullBox.y -= pMonitor->vecPosition.y; - m_seExtents = { { m_vLastWindowPos.x - fullBox.x - pMonitor->vecPosition.x + 2, m_vLastWindowPos.y - fullBox.y - pMonitor->vecPosition.y + 2 }, - { fullBox.x + fullBox.width + pMonitor->vecPosition.x - m_vLastWindowPos.x - m_vLastWindowSize.x + 2, - fullBox.y + fullBox.height + pMonitor->vecPosition.y - m_vLastWindowPos.y - m_vLastWindowSize.y + 2 } }; + m_seExtents = {{m_vLastWindowPos.x - fullBox.x - pMonitor->vecPosition.x + 2, m_vLastWindowPos.y - fullBox.y - pMonitor->vecPosition.y + 2}, + {fullBox.x + fullBox.width + pMonitor->vecPosition.x - m_vLastWindowPos.x - m_vLastWindowSize.x + 2, + fullBox.y + fullBox.height + pMonitor->vecPosition.y - m_vLastWindowPos.y - m_vLastWindowSize.y + 2}}; fullBox.x += offset.x; fullBox.y += offset.y; - if (fullBox.width < 1 || fullBox.height < 1) - return; // don't draw invisible shadows + if (fullBox.width < 1 || fullBox.height < 1) return; // don't draw invisible shadows g_pHyprOpenGL->scissor((wlr_box*)nullptr); @@ -60,10 +56,10 @@ void CBordersPlusPlus::draw(CMonitor* pMonitor, float a, const Vector2D& offset) // pass 2 - if (*PBORDERS < 2) - return; + if (*PBORDERS < 2) return; - fullBox = { (int)(m_vLastWindowPos.x - *PBORDERSIZE * 2), (int)(m_vLastWindowPos.y - *PBORDERSIZE * 2), (int)(m_vLastWindowSize.x + 2.0 * *PBORDERSIZE * 2), (int)(m_vLastWindowSize.y + 2.0 * *PBORDERSIZE * 2) }; + fullBox = {(int)(m_vLastWindowPos.x - *PBORDERSIZE * 2 + offset.x), (int)(m_vLastWindowPos.y - *PBORDERSIZE * 2 + offset.y), + (int)(m_vLastWindowSize.x + 2.0 * *PBORDERSIZE * 2), (int)(m_vLastWindowSize.y + 2.0 * *PBORDERSIZE * 2)}; scaleBox(&fullBox, pMonitor->scale); g_pHyprOpenGL->renderBorder(&fullBox, CColor(*PCOLOR1), *PROUNDING * pMonitor->scale + *PBORDERSIZE * 2, a); @@ -71,15 +67,14 @@ void CBordersPlusPlus::draw(CMonitor* pMonitor, float a, const Vector2D& offset) fullBox.x -= pMonitor->vecPosition.x; fullBox.y -= pMonitor->vecPosition.y; - m_seExtents = { { m_vLastWindowPos.x - fullBox.x - pMonitor->vecPosition.x + 2, m_vLastWindowPos.y - fullBox.y - pMonitor->vecPosition.y + 2 }, - { fullBox.x + fullBox.width + pMonitor->vecPosition.x - m_vLastWindowPos.x - m_vLastWindowSize.x + 2, - fullBox.y + fullBox.height + pMonitor->vecPosition.y - m_vLastWindowPos.y - m_vLastWindowSize.y + 2 } }; + m_seExtents = {{m_vLastWindowPos.x - fullBox.x - pMonitor->vecPosition.x + 2, m_vLastWindowPos.y - fullBox.y - pMonitor->vecPosition.y + 2}, + {fullBox.x + fullBox.width + pMonitor->vecPosition.x - m_vLastWindowPos.x - m_vLastWindowSize.x + 2, + fullBox.y + fullBox.height + pMonitor->vecPosition.y - m_vLastWindowPos.y - m_vLastWindowSize.y + 2}}; fullBox.x += offset.x; fullBox.y += offset.y; - if (fullBox.width < 1 || fullBox.height < 1) - return; // don't draw invisible shadows + if (fullBox.width < 1 || fullBox.height < 1) return; // don't draw invisible shadows g_pHyprOpenGL->scissor((wlr_box*)nullptr); @@ -87,12 +82,9 @@ void CBordersPlusPlus::draw(CMonitor* pMonitor, float a, const Vector2D& offset) g_pHyprOpenGL->renderBorder(&fullBox, CColor(*PCOLOR2), *PROUNDING * pMonitor->scale + *PBORDERSIZE * 2, a); } -eDecorationType CBordersPlusPlus::getDecorationType() { - return DECORATION_CUSTOM; -} +eDecorationType CBordersPlusPlus::getDecorationType() { return DECORATION_CUSTOM; } void CBordersPlusPlus::updateWindow(CWindow* pWindow) { - m_vLastWindowPos = pWindow->m_vRealPosition.vec(); m_vLastWindowSize = pWindow->m_vRealSize.vec(); @@ -100,6 +92,7 @@ void CBordersPlusPlus::updateWindow(CWindow* pWindow) { } void CBordersPlusPlus::damageEntire() { - wlr_box dm = { (int)(m_vLastWindowPos.x - m_seExtents.topLeft.x), (int)(m_vLastWindowPos.y - m_seExtents.topLeft.y), (int)(m_vLastWindowSize.x + m_seExtents.topLeft.x + m_seExtents.bottomRight.x), (int)m_seExtents.topLeft.y }; + wlr_box dm = {(int)(m_vLastWindowPos.x - m_seExtents.topLeft.x), (int)(m_vLastWindowPos.y - m_seExtents.topLeft.y), + (int)(m_vLastWindowSize.x + m_seExtents.topLeft.x + m_seExtents.bottomRight.x), (int)m_seExtents.topLeft.y}; g_pHyprRenderer->damageBox(&dm); } \ No newline at end of file