diff --git a/src/Compositor.cpp b/src/Compositor.cpp index f67cf809..eb51a1f4 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -1741,10 +1741,10 @@ void CCompositor::updateWindowAnimatedDecorationValues(CWindow* pWindow) { static auto* const INACTIVECOL = (CGradientValueData*)g_pConfigManager->getConfigValuePtr("general:col.inactive_border")->data.get(); static auto* const NOGROUPACTIVECOL = (CGradientValueData*)g_pConfigManager->getConfigValuePtr("general:col.nogroup_border_active")->data.get(); static auto* const NOGROUPINACTIVECOL = (CGradientValueData*)g_pConfigManager->getConfigValuePtr("general:col.nogroup_border")->data.get(); - static auto* const GROUPINACTIVECOL = (CGradientValueData*)g_pConfigManager->getConfigValuePtr("group:col.border")->data.get(); static auto* const GROUPACTIVECOL = (CGradientValueData*)g_pConfigManager->getConfigValuePtr("group:col.border_active")->data.get(); - static auto* const GROUPINACTIVELOCKEDCOL = (CGradientValueData*)g_pConfigManager->getConfigValuePtr("group:col.border_locked")->data.get(); + static auto* const GROUPINACTIVECOL = (CGradientValueData*)g_pConfigManager->getConfigValuePtr("group:col.border_inactive")->data.get(); static auto* const GROUPACTIVELOCKEDCOL = (CGradientValueData*)g_pConfigManager->getConfigValuePtr("group:col.border_locked_active")->data.get(); + static auto* const GROUPINACTIVELOCKEDCOL = (CGradientValueData*)g_pConfigManager->getConfigValuePtr("group:col.border_locked_inactive")->data.get(); static auto* const PINACTIVEALPHA = &g_pConfigManager->getConfigValuePtr("decoration:inactive_opacity")->floatValue; static auto* const PACTIVEALPHA = &g_pConfigManager->getConfigValuePtr("decoration:active_opacity")->floatValue; static auto* const PFULLSCREENALPHA = &g_pConfigManager->getConfigValuePtr("decoration:fullscreen_opacity")->floatValue; diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index c1fc280e..bcd06889 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -19,10 +19,15 @@ CConfigManager::CConfigManager() { configValues["general:col.inactive_border"].data = std::make_shared(0xff444444); configValues["general:col.nogroup_border"].data = std::make_shared(0xffffaaff); configValues["general:col.nogroup_border_active"].data = std::make_shared(0xffff00ff); - configValues["group:col.border"].data = std::make_shared(0x66777700); configValues["group:col.border_active"].data = std::make_shared(0x66ffff00); - configValues["group:col.border_locked"].data = std::make_shared(0x66775500); + configValues["group:col.border_inactive"].data = std::make_shared(0x66777700); configValues["group:col.border_locked_active"].data = std::make_shared(0x66ff5500); + configValues["group:col.border_locked_inactive"].data = std::make_shared(0x66775500); + + configValues["group:groupbar:col.active"].data = std::make_shared(0x66ffff00); + configValues["group:groupbar:col.inactive"].data = std::make_shared(0x66777700); + configValues["group:groupbar:col.locked_active"].data = std::make_shared(0x66ff5500); + configValues["group:groupbar:col.locked_inactive"].data = std::make_shared(0x66775500); setDefaultVars(); setDefaultAnimationVars(); @@ -114,12 +119,12 @@ void CConfigManager::setDefaultVars() { configValues["misc:background_color"].intValue = 0xff111111; configValues["misc:new_window_takes_over_fullscreen"].intValue = 0; - ((CGradientValueData*)configValues["group:col.border"].data.get())->reset(0x66777700); ((CGradientValueData*)configValues["group:col.border_active"].data.get())->reset(0x66ffff00); - ((CGradientValueData*)configValues["group:col.border_locked"].data.get())->reset(0x66775500); + ((CGradientValueData*)configValues["group:col.border_inactive"].data.get())->reset(0x66777700); ((CGradientValueData*)configValues["group:col.border_locked_active"].data.get())->reset(0x66ff5500); - configValues["group:insert_after_current"].intValue = 1; - configValues["group:focus_removed_window"].intValue = 1; + ((CGradientValueData*)configValues["group:col.border_locked_inactive"].data.get())->reset(0x66775500); + configValues["group:insert_after_current"].intValue = 1; + configValues["group:focus_removed_window"].intValue = 1; configValues["group:groupbar:font"].strValue = "Sans"; configValues["group:groupbar:height"].intValue = 20; @@ -129,6 +134,10 @@ void CConfigManager::setDefaultVars() { configValues["group:groupbar:text_color"].intValue = 0xffffffff; configValues["group:groupbar:titles_font_size"].intValue = 8; configValues["group:groupbar:top"].intValue = 1; + ((CGradientValueData*)configValues["group:groupbar:col.active"].data.get())->reset(0x66ffff00); + ((CGradientValueData*)configValues["group:groupbar:col.inactive"].data.get())->reset(0x66777700); + ((CGradientValueData*)configValues["group:groupbar:col.locked_active"].data.get())->reset(0x66ff5500); + ((CGradientValueData*)configValues["group:groupbar:col.locked_inactive"].data.get())->reset(0x66775500); configValues["debug:int"].intValue = 0; configValues["debug:log_damage"].intValue = 0; diff --git a/src/render/decorations/CHyprGroupBarDecoration.cpp b/src/render/decorations/CHyprGroupBarDecoration.cpp index cd14e736..a5c7e6f6 100644 --- a/src/render/decorations/CHyprGroupBarDecoration.cpp +++ b/src/render/decorations/CHyprGroupBarDecoration.cpp @@ -107,10 +107,10 @@ void CHyprGroupBarDecoration::draw(CMonitor* pMonitor, float a, const Vector2D& scaleBox(&rect, pMonitor->scale); - static auto* const PGROUPCOLINACTIVE = &g_pConfigManager->getConfigValuePtr("group:col.border")->data; - static auto* const PGROUPCOLACTIVE = &g_pConfigManager->getConfigValuePtr("group:col.border_active")->data; - static auto* const PGROUPCOLINACTIVELOCKED = &g_pConfigManager->getConfigValuePtr("group:col.border_locked")->data; - static auto* const PGROUPCOLACTIVELOCKED = &g_pConfigManager->getConfigValuePtr("group:col.border_locked_active")->data; + static auto* const PGROUPCOLACTIVE = &g_pConfigManager->getConfigValuePtr("group:groupbar:col.active")->data; + static auto* const PGROUPCOLINACTIVE = &g_pConfigManager->getConfigValuePtr("group:groupbar:col.inactive")->data; + static auto* const PGROUPCOLACTIVELOCKED = &g_pConfigManager->getConfigValuePtr("group:groupbar:col.locked_active")->data; + static auto* const PGROUPCOLINACTIVELOCKED = &g_pConfigManager->getConfigValuePtr("group:groupbar:col.locked_inactive")->data; const bool GROUPLOCKED = m_pWindow->getGroupHead()->m_sGroupData.locked; const auto* const PCOLACTIVE = GROUPLOCKED ? PGROUPCOLACTIVELOCKED : PGROUPCOLACTIVE; @@ -288,10 +288,10 @@ void CHyprGroupBarDecoration::refreshGradients() { if (m_tGradientActive.m_iTexID > 0) return; - static auto* const PGROUPCOLINACTIVE = &g_pConfigManager->getConfigValuePtr("group:col.border")->data; - static auto* const PGROUPCOLACTIVE = &g_pConfigManager->getConfigValuePtr("group:col.border_active")->data; - static auto* const PGROUPCOLINACTIVELOCKED = &g_pConfigManager->getConfigValuePtr("group:col.border_locked")->data; - static auto* const PGROUPCOLACTIVELOCKED = &g_pConfigManager->getConfigValuePtr("group:col.border_locked_active")->data; + static auto* const PGROUPCOLACTIVE = &g_pConfigManager->getConfigValuePtr("group:groupbar:col.active")->data; + static auto* const PGROUPCOLINACTIVE = &g_pConfigManager->getConfigValuePtr("group:groupbar:col.inactive")->data; + static auto* const PGROUPCOLACTIVELOCKED = &g_pConfigManager->getConfigValuePtr("group:groupbar:col.locked_active")->data; + static auto* const PGROUPCOLINACTIVELOCKED = &g_pConfigManager->getConfigValuePtr("group:groupbar:col.locked_inactive")->data; const bool GROUPLOCKED = m_pWindow->getGroupHead()->m_sGroupData.locked; const auto* const PCOLACTIVE = GROUPLOCKED ? PGROUPCOLACTIVELOCKED : PGROUPCOLACTIVE;