diff options
| author | Vaxry <vaxry@vaxry.net> | 2025-05-02 16:29:04 +0100 |
|---|---|---|
| committer | Vaxry <vaxry@vaxry.net> | 2025-05-02 16:29:15 +0100 |
| commit | 77ecf0950685c7872b3aa8c2e63ef4147b0bb685 (patch) | |
| tree | 9cb9af16998f5dd150f8b5a512236d187db2a8b0 | |
| parent | f1ac1847ffaccad9d4faf2e47066202d7ab915d1 (diff) | |
internal: fix name confusion in SAlphaValue
fixes #10251
| -rw-r--r-- | src/desktop/Window.hpp | 8 | ||||
| -rw-r--r-- | src/managers/KeybindManager.cpp | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/desktop/Window.hpp b/src/desktop/Window.hpp index cc62dd3b..449c9c60 100644 --- a/src/desktop/Window.hpp +++ b/src/desktop/Window.hpp @@ -68,13 +68,13 @@ class IWindowTransformer; struct SAlphaValue { float alpha; - bool override; + bool overridden; - float applyAlpha(float alpha) const { - if (override) + float applyAlpha(float a) const { + if (overridden) return alpha; else - return alpha * alpha; + return alpha * a; }; }; diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp index aea49061..bae7c559 100644 --- a/src/managers/KeybindManager.cpp +++ b/src/managers/KeybindManager.cpp @@ -3194,13 +3194,13 @@ SDispatchResult CKeybindManager::setProp(std::string args) { PWINDOW->clampWindowSize(PWINDOW->m_windowData.minSize.value(), std::nullopt); PWINDOW->setHidden(false); } else if (PROP == "alpha") { - PWINDOW->m_windowData.alpha = CWindowOverridableVar(SAlphaValue{std::stof(VAL), PWINDOW->m_windowData.alpha.valueOrDefault().override}, PRIORITY_SET_PROP); + PWINDOW->m_windowData.alpha = CWindowOverridableVar(SAlphaValue{std::stof(VAL), PWINDOW->m_windowData.alpha.valueOrDefault().overridden}, PRIORITY_SET_PROP); } else if (PROP == "alphainactive") { PWINDOW->m_windowData.alphaInactive = - CWindowOverridableVar(SAlphaValue{std::stof(VAL), PWINDOW->m_windowData.alphaInactive.valueOrDefault().override}, PRIORITY_SET_PROP); + CWindowOverridableVar(SAlphaValue{std::stof(VAL), PWINDOW->m_windowData.alphaInactive.valueOrDefault().overridden}, PRIORITY_SET_PROP); } else if (PROP == "alphafullscreen") { PWINDOW->m_windowData.alphaFullscreen = - CWindowOverridableVar(SAlphaValue{std::stof(VAL), PWINDOW->m_windowData.alphaFullscreen.valueOrDefault().override}, PRIORITY_SET_PROP); + CWindowOverridableVar(SAlphaValue{std::stof(VAL), PWINDOW->m_windowData.alphaFullscreen.valueOrDefault().overridden}, PRIORITY_SET_PROP); } else if (PROP == "alphaoverride") { PWINDOW->m_windowData.alpha = CWindowOverridableVar(SAlphaValue{PWINDOW->m_windowData.alpha.valueOrDefault().alpha, (bool)configStringToInt(VAL).value_or(0)}, PRIORITY_SET_PROP); |