summaryrefslogtreecommitdiff
path: root/src/Compositor.cpp
diff options
context:
space:
mode:
authorJef <54236+ElJeffe@users.noreply.github.com>2022-11-13 20:33:13 +0100
committerGitHub <noreply@github.com>2022-11-13 19:33:13 +0000
commit549fdf63f6f72fadf4e1f67f42fc2a99d625b42e (patch)
treedb06da03842266c024ea8e6d6604630cdd79d8e4 /src/Compositor.cpp
parent1a14841a75b2c387b9f67b7f7c40e0b5d3e1f86b (diff)
Add bordercolor windowrule (#992)
* Add bordercolor windowrule * remove spaces form bordercolor rule + typo Co-authored-by: Jef Steelant <jef.steelant_ext@softathome.com>
Diffstat (limited to 'src/Compositor.cpp')
-rw-r--r--src/Compositor.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 4638f3f0..b1bbe800 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -1415,7 +1415,9 @@ void CCompositor::updateWindowAnimatedDecorationValues(CWindow* pWindow) {
if (RENDERDATA.isBorderColor)
pWindow->m_cRealBorderColor = RENDERDATA.borderColor;
else
- pWindow->m_cRealBorderColor = CColor(pWindow == m_pLastWindow ? *ACTIVECOL : *INACTIVECOL);
+ pWindow->m_cRealBorderColor = CColor(pWindow == m_pLastWindow ?
+ (pWindow->m_sSpecialRenderData.activeBorderColor >= 0 ? pWindow->m_sSpecialRenderData.activeBorderColor : *ACTIVECOL) :
+ (pWindow->m_sSpecialRenderData.inactiveBorderColor >= 0 ? pWindow->m_sSpecialRenderData.inactiveBorderColor : *INACTIVECOL));
// opacity