From fa9ef0628d528f1166d74c64e008f947d83d6810 Mon Sep 17 00:00:00 2001 From: vaxerski Date: Tue, 28 Feb 2023 12:06:21 +0000 Subject: [PATCH] fix borders on workspace anims --- borders-plus-plus/borderDeco.cpp | 63 ++++++++++++++++++++------------ borders-plus-plus/main.cpp | 18 +++++---- 2 files changed, 50 insertions(+), 31 deletions(-) diff --git a/borders-plus-plus/borderDeco.cpp b/borders-plus-plus/borderDeco.cpp index c11f710..4ed91ff 100644 --- a/borders-plus-plus/borderDeco.cpp +++ b/borders-plus-plus/borderDeco.cpp @@ -6,36 +6,42 @@ #include "globals.hpp" CBordersPlusPlus::CBordersPlusPlus(CWindow* pWindow) { - m_pWindow = pWindow; - m_vLastWindowPos = pWindow->m_vRealPosition.vec(); + 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; - static auto* const PBORDERS = &HyprlandAPI::getConfigValue(PHANDLE, "plugin:borders-plus-plus:add_borders")->intValue; - static auto* const PROUNDING = &HyprlandAPI::getConfigValue(PHANDLE, "decoration:rounding")->intValue; + 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; + static auto* const PBORDERS = &HyprlandAPI::getConfigValue(PHANDLE, "plugin:borders-plus-plus:add_borders")->intValue; + 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 + offset.x), (int)(m_vLastWindowPos.y - *PBORDERSIZE + offset.y), - (int)(m_vLastWindowSize.x + 2.0 * *PBORDERSIZE), (int)(m_vLastWindowSize.y + 2.0 * *PBORDERSIZE)}; + 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)}; fullBox.x -= pMonitor->vecPosition.x; fullBox.y -= pMonitor->vecPosition.y; @@ -47,7 +53,8 @@ void CBordersPlusPlus::draw(CMonitor* pMonitor, float a, const Vector2D& offset) 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); @@ -56,10 +63,11 @@ 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 + 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)}; + 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)}; scaleBox(&fullBox, pMonitor->scale); g_pHyprOpenGL->renderBorder(&fullBox, CColor(*PCOLOR1), *PROUNDING * pMonitor->scale + *PBORDERSIZE * 2, a); @@ -74,7 +82,8 @@ void CBordersPlusPlus::draw(CMonitor* pMonitor, float a, const Vector2D& offset) 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); @@ -82,10 +91,16 @@ 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(); + const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(pWindow->m_iWorkspaceID); + + const auto WORKSPACEOFFSET = PWORKSPACE && !pWindow->m_bPinned ? PWORKSPACE->m_vRenderOffset.vec() : Vector2D(); + + m_vLastWindowPos = pWindow->m_vRealPosition.vec() + WORKSPACEOFFSET; m_vLastWindowSize = pWindow->m_vRealSize.vec(); damageEntire(); diff --git a/borders-plus-plus/main.cpp b/borders-plus-plus/main.cpp index e66caa7..fa23201 100644 --- a/borders-plus-plus/main.cpp +++ b/borders-plus-plus/main.cpp @@ -11,7 +11,9 @@ #include "globals.hpp" // Do NOT change this function. -APICALL EXPORT std::string PLUGIN_API_VERSION() { return HYPRLAND_API_VERSION; } +APICALL EXPORT std::string PLUGIN_API_VERSION() { + return HYPRLAND_API_VERSION; +} void onNewWindow(void* self, std::any data) { // data is guaranteed @@ -23,9 +25,9 @@ void onNewWindow(void* self, std::any data) { APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) { PHANDLE = handle; - HyprlandAPI::addConfigValue(PHANDLE, "plugin:borders-plus-plus:add_borders", SConfigValue { .intValue = 1 }); - HyprlandAPI::addConfigValue(PHANDLE, "plugin:borders-plus-plus:col.border_1", SConfigValue { .intValue = configStringToInt("rgba(000000ee)") }); - HyprlandAPI::addConfigValue(PHANDLE, "plugin:borders-plus-plus:col.border_2", SConfigValue { .intValue = configStringToInt("rgba(000000ee)") }); + HyprlandAPI::addConfigValue(PHANDLE, "plugin:borders-plus-plus:add_borders", SConfigValue{.intValue = 1}); + HyprlandAPI::addConfigValue(PHANDLE, "plugin:borders-plus-plus:col.border_1", SConfigValue{.intValue = configStringToInt("rgba(000000ee)")}); + HyprlandAPI::addConfigValue(PHANDLE, "plugin:borders-plus-plus:col.border_2", SConfigValue{.intValue = configStringToInt("rgba(000000ee)")}); HyprlandAPI::registerCallbackDynamic(PHANDLE, "openWindow", [&](void* self, std::any data) { onNewWindow(self, data); }); @@ -39,9 +41,11 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) { HyprlandAPI::reloadConfig(); - HyprlandAPI::addNotification(PHANDLE, "[borders-plus-plus] Initialized successfully!", CColor { 0.2, 1.0, 0.2, 1.0 }, 5000); + HyprlandAPI::addNotification(PHANDLE, "[borders-plus-plus] Initialized successfully!", CColor{0.2, 1.0, 0.2, 1.0}, 5000); - return { "borders-plus-plus", "A plugin to add more borders to windows.", "Vaxry", "1.0" }; + return {"borders-plus-plus", "A plugin to add more borders to windows.", "Vaxry", "1.0"}; } -APICALL EXPORT void PLUGIN_EXIT() { ; } \ No newline at end of file +APICALL EXPORT void PLUGIN_EXIT() { + ; +} \ No newline at end of file