Trensa-Organization/hy3
1
0
Fork 0
mirror of https://github.com/Trensa-Organization/hy3.git synced 2025-03-15 18:53:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Switched to using the new getWorkspaceRulesFor API

Browse source
This commit is contained in:
Visti Andresen 2024-04-01 18:18:33 +02:00
parent cc953fc8c0
commit 45a6664d7e
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Hy3Layout.cpp
View file

@ -1476,7 +1476,7 @@ void Hy3Layout::applyNodeDataToWindow(Hy3Node* node, bool no_animation) {
return;
}
const auto workspace_rule = g_pConfigManager->getWorkspaceRuleFor(workspace);
const auto workspace_rules = g_pConfigManager->getWorkspaceRulesFor(workspace);
// clang-format off
static const auto gaps_in = ConfigValue<Hyprlang::CUSTOMTYPE, CCssGapData>("general:gaps_in");
@ -1513,7 +1513,14 @@ void Hy3Layout::applyNodeDataToWindow(Hy3Node* node, bool no_animation) {
&& g_pCompositor->getWorkspaceByID(window->m_iWorkspaceID)->m_efFullscreenMode
== FULLSCREEN_FULL)))
{
window->m_sSpecialRenderData.border = workspace_rule.border.value_or(*no_gaps_when_only == 2);
window->m_sSpecialRenderData.border = *no_gaps_when_only == 2;
for (auto& workspace_rule : workspace_rules) {
if (workspace_rule.border.has_value()) {
//Hyprland src/desktop/Window.cpp, line 1107, SHA 5e8c25d498ed5cb7852ae74a876b0c138a62d59d
//does not break the loop, the last value gets to decide
window->m_sSpecialRenderData.border = workspace_rule.border.value();
}
}
window->m_sSpecialRenderData.rounding = false;
window->m_sSpecialRenderData.shadow = false;