Don't override fullscreen opacity if only two opacities are provided

hyprwm · Apr 9, 2024 · 0850f28 · 0850f28
1 parent d0d1ba5
commit 0850f28
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/src/desktop/Window.cpp b/src/desktop/Window.cpp
@@ -603,32 +603,32 @@ void CWindow::applyDynamicRule(const SWindowRule& r) {
  continue;
 
  if (r == "override") {
- if (opacityIDX == 1) {
- m_sSpecialRenderData.alphaOverride = true;
- m_sSpecialRenderData.alphaInactiveOverride = true;
- m_sSpecialRenderData.alphaFullscreenOverride = true;
- } else if (opacityIDX == 2)
+ if (opacityIDX == 1)
+ m_sSpecialRenderData.alphaOverride = true;
+ else if (opacityIDX == 2)
  m_sSpecialRenderData.alphaInactiveOverride = true;
  else if (opacityIDX == 3)
  m_sSpecialRenderData.alphaFullscreenOverride = true;
  } else {
- if (opacityIDX == 0) {
- m_sSpecialRenderData.alpha = std::stof(r);
- m_sSpecialRenderData.alphaInactive = std::stof(r);
+ if (opacityIDX == 0)
+ m_sSpecialRenderData.alpha = std::stof(r);
+ else if (opacityIDX == 1)
+ m_sSpecialRenderData.alphaInactive = std::stof(r);
+ else if (opacityIDX == 2)
  m_sSpecialRenderData.alphaFullscreen = std::stof(r);
- } else if (opacityIDX == 1) {
- m_sSpecialRenderData.alphaInactive = std::stof(r);
- m_sSpecialRenderData.alphaInactiveOverride = false;
- } else if (opacityIDX == 2) {
- m_sSpecialRenderData.alphaFullscreen = std::stof(r);
- m_sSpecialRenderData.alphaFullscreenOverride = false;
- } else {
+ else
  throw std::runtime_error("more than 3 alpha values");
- }
 
  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()); }
  } else if (r.szRule == "noanim") {
  m_sAdditionalConfigData.forceNoAnims = true;