twin/hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-08-14 19:45:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

core: match all workspace rules instead of the first one only (#5340)

Browse Source
This commit is contained in:
thejch
2024-03-30 17:49:53 -07:00
committed by GitHub
parent 1aed45f61d
commit 5e8c25d498
7 changed files with 91 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/desktop/Window.cpp
View File

@@ -1088,20 +1088,33 @@ float CWindow::rounding() {
}
void CWindow::updateSpecialRenderData() {
const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(m_iWorkspaceID);
const auto WORKSPACERULE = PWORKSPACE ? g_pConfigManager->getWorkspaceRuleFor(PWORKSPACE) : SWorkspaceRule{};
bool border = true;
const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(m_iWorkspaceID);
const auto WORKSPACERULES = PWORKSPACE ? g_pConfigManager->getWorkspaceRulesFor(PWORKSPACE) : std::vector<SWorkspaceRule>{};
bool border = true;
static auto PNOBORDERONFLOATING = CConfigValue<Hyprlang::INT>("general:no_border_on_floating");
if (m_bIsFloating && *PNOBORDERONFLOATING == 1)
border = false;
m_sSpecialRenderData.border = WORKSPACERULE.border.value_or(border);
m_sSpecialRenderData.borderSize = WORKSPACERULE.borderSize.value_or(-1);
m_sSpecialRenderData.decorate = WORKSPACERULE.decorate.value_or(true);
m_sSpecialRenderData.rounding = WORKSPACERULE.rounding.value_or(true);
m_sSpecialRenderData.shadow = WORKSPACERULE.shadow.value_or(true);
m_sSpecialRenderData.border = border;
m_sSpecialRenderData.borderSize = -1;
m_sSpecialRenderData.decorate = true;
m_sSpecialRenderData.rounding = true;
m_sSpecialRenderData.shadow = true;
for (auto& wsRule : WORKSPACERULES) {
if (wsRule.border.has_value())
m_sSpecialRenderData.border = wsRule.border.value();
if (wsRule.borderSize.has_value())
m_sSpecialRenderData.borderSize = wsRule.borderSize.value();
if (wsRule.decorate.has_value())
m_sSpecialRenderData.decorate = wsRule.decorate.value();
if (wsRule.rounding.has_value())
m_sSpecialRenderData.rounding = wsRule.rounding.value();
if (wsRule.shadow.has_value())
m_sSpecialRenderData.shadow = wsRule.shadow.value();
}
}
int CWindow::getRealBorderSize() {