hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2025-02-18 12:22:09 +01:00
Code Issues Projects Releases Packages Wiki Activity

config: Don't override fullscreen opacity if only two opacities are provided (#5512)

Browse source
This commit is contained in:
SoSeDiK 2024-04-09 18:22:44 +03:00 • committed by GitHub
parent f2addfb404
commit 1343aa865d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/desktop/Window.cpp
View file

@ -603,19 +603,16 @@ void CWindow::applyDynamicRule(const SWindowRule& r) {
continue; continue;
if (r == "override") { if (r == "override") {
if (opacityIDX == 1) { if (opacityIDX == 1)
m_sSpecialRenderData.alphaOverride = true; m_sSpecialRenderData.alphaOverride = true;
m_sSpecialRenderData.alphaInactiveOverride = true; else if (opacityIDX == 2)
m_sSpecialRenderData.alphaFullscreenOverride = true;
} else if (opacityIDX == 2)
m_sSpecialRenderData.alphaInactiveOverride = true; m_sSpecialRenderData.alphaInactiveOverride = true;
else if (opacityIDX == 3) else if (opacityIDX == 3)
m_sSpecialRenderData.alphaFullscreenOverride = true; m_sSpecialRenderData.alphaFullscreenOverride = true;
} else { } else {
if (opacityIDX == 0) { if (opacityIDX == 0) {
m_sSpecialRenderData.alpha = std::stof(r); m_sSpecialRenderData.alpha = std::stof(r);
m_sSpecialRenderData.alphaInactive = std::stof(r); m_sSpecialRenderData.alphaOverride = false;
m_sSpecialRenderData.alphaFullscreen = std::stof(r);
} else if (opacityIDX == 1) { } else if (opacityIDX == 1) {
m_sSpecialRenderData.alphaInactive = std::stof(r); m_sSpecialRenderData.alphaInactive = std::stof(r);
m_sSpecialRenderData.alphaInactiveOverride = false; m_sSpecialRenderData.alphaInactiveOverride = false;
@ -629,6 +626,13 @@ void CWindow::applyDynamicRule(const SWindowRule& r) {
opacityIDX++; opacityIDX++;
} }
} }
if (opacityIDX == 1) {
m_sSpecialRenderData.alphaInactiveOverride = m_sSpecialRenderData.alphaOverride;
m_sSpecialRenderData.alphaInactive = m_sSpecialRenderData.alpha;
m_sSpecialRenderData.alphaFullscreenOverride = m_sSpecialRenderData.alphaOverride;
m_sSpecialRenderData.alphaFullscreen = m_sSpecialRenderData.alpha;
}
} catch (std::exception& e) { Debug::log(ERR, "Opacity rule \"{}\" failed with: {}", r.szRule, e.what()); } } catch (std::exception& e) { Debug::log(ERR, "Opacity rule \"{}\" failed with: {}", r.szRule, e.what()); }
} else if (r.szRule == "noanim") { } else if (r.szRule == "noanim") {
m_sAdditionalConfigData.forceNoAnims = true; m_sAdditionalConfigData.forceNoAnims = true;