nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: anims should not be per monitor

Browse source
This commit is contained in:
2 * r + 2 * t 2026-04-12 23:22:48 +10:00
parent 03c1e5060a
commit 0432c4708e
3 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugin/src/Caelestia/Config/appearanceconfig.hpp
View file

@ -169,7 +169,7 @@ class AnimDurations : public ConfigObject {
Q_OBJECT Q_OBJECT
QML_ANONYMOUS QML_ANONYMOUS
CONFIG_PROPERTY(qreal, scale, 1) CONFIG_GLOBAL_PROPERTY(qreal, scale, 1)
Q_PROPERTY(int small READ small NOTIFY valuesChanged) Q_PROPERTY(int small READ small NOTIFY valuesChanged)
Q_PROPERTY(int normal READ normal NOTIFY valuesChanged) Q_PROPERTY(int normal READ normal NOTIFY valuesChanged)

32
plugin/src/Caelestia/Config/tokens.hpp
View file

@ -15,15 +15,15 @@ class AnimCurves : public ConfigObject {
Q_OBJECT Q_OBJECT
QML_ANONYMOUS QML_ANONYMOUS
CONFIG_PROPERTY(QList<qreal>, emphasized) CONFIG_GLOBAL_PROPERTY(QList<qreal>, emphasized)
CONFIG_PROPERTY(QList<qreal>, emphasizedAccel) CONFIG_GLOBAL_PROPERTY(QList<qreal>, emphasizedAccel)
CONFIG_PROPERTY(QList<qreal>, emphasizedDecel) CONFIG_GLOBAL_PROPERTY(QList<qreal>, emphasizedDecel)
CONFIG_PROPERTY(QList<qreal>, standard) CONFIG_GLOBAL_PROPERTY(QList<qreal>, standard)
CONFIG_PROPERTY(QList<qreal>, standardAccel) CONFIG_GLOBAL_PROPERTY(QList<qreal>, standardAccel)
CONFIG_PROPERTY(QList<qreal>, standardDecel) CONFIG_GLOBAL_PROPERTY(QList<qreal>, standardDecel)
CONFIG_PROPERTY(QList<qreal>, expressiveFastSpatial) CONFIG_GLOBAL_PROPERTY(QList<qreal>, expressiveFastSpatial)
CONFIG_PROPERTY(QList<qreal>, expressiveDefaultSpatial) CONFIG_GLOBAL_PROPERTY(QList<qreal>, expressiveDefaultSpatial)
CONFIG_PROPERTY(QList<qreal>, expressiveSlowSpatial) CONFIG_GLOBAL_PROPERTY(QList<qreal>, expressiveSlowSpatial)
public: public:
explicit AnimCurves(QObject* parent = nullptr) explicit AnimCurves(QObject* parent = nullptr)
@ -103,13 +103,13 @@ class AnimDurationTokens : public ConfigObject {
Q_OBJECT Q_OBJECT
QML_ANONYMOUS QML_ANONYMOUS
CONFIG_PROPERTY(int, small, 200) CONFIG_GLOBAL_PROPERTY(int, small, 200)
CONFIG_PROPERTY(int, normal, 400) CONFIG_GLOBAL_PROPERTY(int, normal, 400)
CONFIG_PROPERTY(int, large, 600) CONFIG_GLOBAL_PROPERTY(int, large, 600)
CONFIG_PROPERTY(int, extraLarge, 1000) CONFIG_GLOBAL_PROPERTY(int, extraLarge, 1000)
CONFIG_PROPERTY(int, expressiveFastSpatial, 350) CONFIG_GLOBAL_PROPERTY(int, expressiveFastSpatial, 350)
CONFIG_PROPERTY(int, expressiveDefaultSpatial, 500) CONFIG_GLOBAL_PROPERTY(int, expressiveDefaultSpatial, 500)
CONFIG_PROPERTY(int, expressiveSlowSpatial, 650) CONFIG_GLOBAL_PROPERTY(int, expressiveSlowSpatial, 650)
public: public:
explicit AnimDurationTokens(QObject* parent = nullptr) explicit AnimDurationTokens(QObject* parent = nullptr)

12
plugin/src/Caelestia/Config/tokensattached.cpp
View file

@ -29,19 +29,11 @@ void Tokens::connectScope() {
if (!m_scope) if (!m_scope)
return; return;
connect(m_scope, &ConfigScope::configChanged, this, &Tokens::sourceChanged); connect(m_scope, &ConfigScope::configChanged, this, &Tokens::sourceChanged);
connect(m_scope, &ConfigScope::configChanged, this, &Tokens::bindAnim);
} }
void Tokens::bindAnim() { void Tokens::bindAnim() {
auto* appearance = resolveAppearance(m_scope); m_anim->bindDurations(GlobalConfig::instance()->appearance()->anim()->durations());
if (!appearance) m_anim->bindCurves(TokenConfig::instance()->appearance()->curves());
return;
m_anim->bindDurations(appearance->anim()->durations());
auto* tokens = TokenConfig::instance();
if (tokens)
m_anim->bindCurves(tokens->appearance()->curves());
} }
const AppearanceRounding* Tokens::rounding() const { const AppearanceRounding* Tokens::rounding() const {