Added universal duration to styles.
This commit is contained in:
parent
27b7534734
commit
553d5509b5
3 changed files with 8 additions and 5 deletions
|
|
@ -118,6 +118,8 @@ defaultVerticalListSkip: 6px;
|
||||||
shakeShift: 4px;
|
shakeShift: 4px;
|
||||||
shakeDuration: 300;
|
shakeDuration: 300;
|
||||||
|
|
||||||
|
universalDuration: 120;
|
||||||
|
|
||||||
// floating badge colors
|
// floating badge colors
|
||||||
roundedFg: radialFg;
|
roundedFg: radialFg;
|
||||||
roundedBg: radialBg; // closest to #00000066
|
roundedBg: radialBg; // closest to #00000066
|
||||||
|
|
|
||||||
|
|
@ -6,8 +6,9 @@
|
||||||
//
|
//
|
||||||
#include "ui/effects/animations.h"
|
#include "ui/effects/animations.h"
|
||||||
|
|
||||||
#include "ui/ui_utility.h"
|
|
||||||
#include "base/invoke_queued.h"
|
#include "base/invoke_queued.h"
|
||||||
|
#include "ui/ui_utility.h"
|
||||||
|
#include "styles/style_basic.h"
|
||||||
|
|
||||||
#include <QtCore/QPointer>
|
#include <QtCore/QPointer>
|
||||||
|
|
||||||
|
|
@ -22,7 +23,7 @@ namespace Ui {
|
||||||
namespace Animations {
|
namespace Animations {
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
constexpr auto kAnimationTick = crl::time(1000) / 120;
|
constexpr auto kAnimationTick = crl::time(1000) / st::universalDuration;
|
||||||
constexpr auto kIgnoreUpdatesTimeout = crl::time(4);
|
constexpr auto kIgnoreUpdatesTimeout = crl::time(4);
|
||||||
|
|
||||||
Manager *ManagerInstance = nullptr;
|
Manager *ManagerInstance = nullptr;
|
||||||
|
|
|
||||||
|
|
@ -744,7 +744,7 @@ defaultCheck: Check {
|
||||||
diameter: 22px;
|
diameter: 22px;
|
||||||
thickness: 2px;
|
thickness: 2px;
|
||||||
icon: defaultCheckboxIcon;
|
icon: defaultCheckboxIcon;
|
||||||
duration: 120;
|
duration: universalDuration;
|
||||||
rippleAreaPadding: 8px;
|
rippleAreaPadding: 8px;
|
||||||
}
|
}
|
||||||
defaultRadio: Radio {
|
defaultRadio: Radio {
|
||||||
|
|
@ -755,7 +755,7 @@ defaultRadio: Radio {
|
||||||
thickness: 2px;
|
thickness: 2px;
|
||||||
outerSkip: 10px; // * 0.1
|
outerSkip: 10px; // * 0.1
|
||||||
skip: 60px; // * 0.1
|
skip: 60px; // * 0.1
|
||||||
duration: 120;
|
duration: universalDuration;
|
||||||
rippleAreaPadding: 8px;
|
rippleAreaPadding: 8px;
|
||||||
}
|
}
|
||||||
defaultToggle: Toggle {
|
defaultToggle: Toggle {
|
||||||
|
|
@ -763,7 +763,7 @@ defaultToggle: Toggle {
|
||||||
toggledFg: windowBgActive;
|
toggledFg: windowBgActive;
|
||||||
untoggledBg: windowBg;
|
untoggledBg: windowBg;
|
||||||
untoggledFg: checkboxFg;
|
untoggledFg: checkboxFg;
|
||||||
duration: 120;
|
duration: universalDuration;
|
||||||
border: 2px;
|
border: 2px;
|
||||||
shift: 1px;
|
shift: 1px;
|
||||||
diameter: 16px;
|
diameter: 16px;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue