diff --git a/ui/basic.style b/ui/basic.style index 8d55bac..de0312c 100644 --- a/ui/basic.style +++ b/ui/basic.style @@ -118,6 +118,8 @@ defaultVerticalListSkip: 6px; shakeShift: 4px; shakeDuration: 300; +universalDuration: 120; + // floating badge colors roundedFg: radialFg; roundedBg: radialBg; // closest to #00000066 diff --git a/ui/effects/animations.cpp b/ui/effects/animations.cpp index b0c69d9..3fb737a 100644 --- a/ui/effects/animations.cpp +++ b/ui/effects/animations.cpp @@ -6,8 +6,9 @@ // #include "ui/effects/animations.h" -#include "ui/ui_utility.h" #include "base/invoke_queued.h" +#include "ui/ui_utility.h" +#include "styles/style_basic.h" #include @@ -22,7 +23,7 @@ namespace Ui { namespace Animations { namespace { -constexpr auto kAnimationTick = crl::time(1000) / 120; +constexpr auto kAnimationTick = crl::time(1000) / st::universalDuration; constexpr auto kIgnoreUpdatesTimeout = crl::time(4); Manager *ManagerInstance = nullptr; diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style index 5c23204..0b5ef52 100644 --- a/ui/widgets/widgets.style +++ b/ui/widgets/widgets.style @@ -744,7 +744,7 @@ defaultCheck: Check { diameter: 22px; thickness: 2px; icon: defaultCheckboxIcon; - duration: 120; + duration: universalDuration; rippleAreaPadding: 8px; } defaultRadio: Radio { @@ -755,7 +755,7 @@ defaultRadio: Radio { thickness: 2px; outerSkip: 10px; // * 0.1 skip: 60px; // * 0.1 - duration: 120; + duration: universalDuration; rippleAreaPadding: 8px; } defaultToggle: Toggle { @@ -763,7 +763,7 @@ defaultToggle: Toggle { toggledFg: windowBgActive; untoggledBg: windowBg; untoggledFg: checkboxFg; - duration: 120; + duration: universalDuration; border: 2px; shift: 1px; diameter: 16px;