From 804991a69c930fc203250e240ed7c9a8c9c0184f Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Tue, 23 Apr 2024 20:23:29 +0300 Subject: [PATCH] Added universal duration to styles. --- Telegram/SourceFiles/boxes/boxes.style | 2 +- Telegram/SourceFiles/calls/calls_top_bar.cpp | 4 +- .../group/ui/calls_group_recording_box.cpp | 4 +- .../chat_helpers/chat_helpers.style | 2 - .../chat_helpers/emoji_suggestions_widget.cpp | 5 +- Telegram/SourceFiles/dialogs/dialogs.style | 2 +- .../history_view_voice_record_bar.cpp | 47 ++++++++++++------- .../history_view_voice_record_button.cpp | 4 +- .../info/userpic/info_userpic_builder.style | 2 - .../userpic/info_userpic_colors_editor.cpp | 6 +-- .../info_userpic_emoji_builder_widget.cpp | 2 +- Telegram/SourceFiles/intro/intro.style | 1 - .../SourceFiles/intro/intro_code_input.cpp | 6 +-- Telegram/SourceFiles/ui/chat/chat.style | 2 +- .../SourceFiles/ui/controls/send_button.cpp | 2 +- 15 files changed, 48 insertions(+), 43 deletions(-) diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style index f64f2103d3..890bb87e7d 100644 --- a/Telegram/SourceFiles/boxes/boxes.style +++ b/Telegram/SourceFiles/boxes/boxes.style @@ -546,7 +546,7 @@ rightsToggle: Toggle(defaultToggle) { vsize: 5px; vshift: 1px; stroke: 2px; - duration: 120; + duration: universalDuration; } rightsButton: SettingsButton(defaultSettingsButton) { diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp index 6a33145785..dea58fd2f1 100644 --- a/Telegram/SourceFiles/calls/calls_top_bar.cpp +++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp @@ -33,6 +33,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "main/main_session.h" #include "boxes/abstract_box.h" #include "base/timer.h" +#include "styles/style_basic.h" #include "styles/style_calls.h" #include "styles/style_chat_helpers.h" // style::GroupCallUserpics #include "styles/style_layers.h" @@ -49,7 +50,6 @@ enum class BarState { namespace { constexpr auto kUpdateDebugTimeoutMs = crl::time(500); -constexpr auto kSwitchStateDuration = 120; constexpr auto kMinorBlobAlpha = 76. / 255.; @@ -374,7 +374,7 @@ void TopBar::initControls() { }; _switchStateAnimation.stop(); - const auto duration = (to - from) * kSwitchStateDuration; + const auto duration = (to - from) * st::universalDuration; _switchStateAnimation.start( _switchStateCallback, from, diff --git a/Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp b/Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp index 30a492a3f4..513fa203c9 100644 --- a/Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp +++ b/Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp @@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/checkbox.h" #include "ui/widgets/fields/input_field.h" #include "ui/widgets/labels.h" +#include "styles/style_basic.h" #include "styles/style_calls.h" #include "styles/style_layers.h" #include "styles/style_boxes.h" @@ -26,7 +27,6 @@ namespace { constexpr auto kRoundRadius = 9; constexpr auto kMaxGroupCallLength = 40; constexpr auto kSwitchDuration = 200; -constexpr auto kSelectDuration = 120; class GraphicButton final : public Ui::AbstractButton { public: @@ -103,7 +103,7 @@ void GraphicButton::setToggled(bool value) { [=] { update(); }, _toggled ? 0. : 1., _toggled ? 1. : 0., - kSelectDuration); + st::universalDuration); } void GraphicButton::paintEvent(QPaintEvent *e) { diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style index d5a443d8e6..67358e4c97 100644 --- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style +++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style @@ -1108,8 +1108,6 @@ historyRecordVoiceFgOver: historyComposeIconFgOver; historyRecordVoiceFgInactive: attentionButtonFg; historyRecordVoiceFgActive: windowBgActive; historyRecordVoiceFgActiveIcon: windowFgActive; -historyRecordVoiceShowDuration: 120; -historyRecordVoiceDuration: 120; historyRecordVoice: icon {{ "chat/input_record", historyRecordVoiceFg }}; historyRecordVoiceOver: icon {{ "chat/input_record", historyRecordVoiceFgOver }}; historyRecordVoiceOnceBg: icon {{ "voice_lock/audio_once_bg", historySendIconFg }}; diff --git a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp index f6c54ec6d0..2238700444 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp @@ -38,7 +38,6 @@ namespace { constexpr auto kShowExactDelay = crl::time(300); constexpr auto kMaxNonScrolledEmoji = 7; -constexpr auto kAnimationDuration = crl::time(120); } // namespace @@ -528,7 +527,7 @@ void SuggestionsWidget::setSelected(int selected, anim::type animated) { [=] { update(); }, _selected, selected, - kAnimationDuration, + st::universalDuration, anim::sineInOut); if (_scrollMax > 0) { const auto selectedMax = int(_rows.size()) - 3; @@ -560,7 +559,7 @@ void SuggestionsWidget::scrollTo(int value, anim::type animated) { [=] { update(); }, _scrollValue, value, - kAnimationDuration, + st::universalDuration, anim::sineInOut); } _scrollValue = value; diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style index 5827ae6e19..3ee37b6f91 100644 --- a/Telegram/SourceFiles/dialogs/dialogs.style +++ b/Telegram/SourceFiles/dialogs/dialogs.style @@ -116,7 +116,7 @@ dialogsSpeakingDenominator: 8.; dialogsImportantBarHeight: 37px; -dialogsWidthDuration: 120; +dialogsWidthDuration: universalDuration; dialogsTextWidthMin: 150px; dialogsTextPalette: TextPalette(defaultTextPalette) { diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp index ade1c9eec3..912bf454d5 100644 --- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp +++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp @@ -302,7 +302,7 @@ TTLButton::TTLButton( [=] { update(); }, isActive ? 0. : 1., isActive ? 1. : 0., - st::historyRecordVoiceShowDuration); + st::universalDuration); }); Ui::RpWidget::shownValue() | rpl::start_with_next([=](bool shown) { @@ -1058,9 +1058,11 @@ void RecordLock::drawProgress(QPainter &p) { } void RecordLock::startLockingAnimation(float64 to) { - auto callback = [=](float64 value) { setProgress(value); }; - const auto &duration = st::historyRecordVoiceShowDuration; - _lockEnderAnimation.start(std::move(callback), 0., to, duration); + _lockEnderAnimation.start( + [=](float64 value) { setProgress(value); }, + 0., + to, + st::universalDuration); } void RecordLock::requestPaintProgress(float64 progress) { @@ -1453,7 +1455,7 @@ void VoiceRecordBar::init() { if (!value) { _listen = nullptr; } - }, 1., 0., st::historyRecordVoiceShowDuration * 2); + }, 1., 0., st::universalDuration * 2); setLevelAsSend(); return; @@ -1473,7 +1475,6 @@ void VoiceRecordBar::init() { // _lockShowing = false; const auto to = 1.; - const auto &duration = st::historyRecordVoiceShowDuration; auto callback = [=](float64 value) { paintShowListenCallback(value); if (to == value) { @@ -1481,7 +1482,11 @@ void VoiceRecordBar::init() { } }; _showListenAnimation.stop(); - _showListenAnimation.start(std::move(callback), 0., to, duration); + _showListenAnimation.start( + std::move(callback), + 0., + to, + st::universalDuration); }, lifetime()); _lock->locks( @@ -1498,15 +1503,16 @@ void VoiceRecordBar::init() { setLevelAsSend(); - const auto &duration = st::historyRecordVoiceShowDuration; - const auto from = 0.; - const auto to = 1.; auto callback = [=](float64 value) { _lock->requestPaintLockToStopProgress(value); update(); updateTTLGeometry(TTLAnimationType::RightLeft, value); }; - _lockToStopAnimation.start(std::move(callback), from, to, duration); + _lockToStopAnimation.start( + std::move(callback), + 0., + 1., + st::universalDuration); }, lifetime()); _send->events( @@ -1523,7 +1529,7 @@ void VoiceRecordBar::init() { return; } _recordingTipRequired = true; - _startTimer.callOnce(st::historyRecordVoiceShowDuration); + _startTimer.callOnce(st::universalDuration); } else if (e->type() == QEvent::MouseButtonRelease) { if (base::take(_recordingTipRequired)) { _recordingTipRequests.fire({}); @@ -1556,23 +1562,24 @@ void VoiceRecordBar::init() { void VoiceRecordBar::activeAnimate(bool active) { const auto to = active ? 1. : 0.; - const auto &duration = st::historyRecordVoiceDuration; if (_activeAnimation.animating()) { - _activeAnimation.change(to, duration); + _activeAnimation.change(to, st::universalDuration); } else { auto callback = [=] { update(_messageRect); _level->requestPaintColor(activeAnimationRatio()); }; - const auto from = active ? 0. : 1.; - _activeAnimation.start(std::move(callback), from, to, duration); + _activeAnimation.start( + std::move(callback), + active ? 0. : 1., + to, + st::universalDuration); } } void VoiceRecordBar::visibilityAnimate(bool show, Fn &&callback) { const auto to = show ? 1. : 0.; const auto from = show ? 0. : 1.; - const auto &duration = st::historyRecordVoiceShowDuration; auto animationCallback = [=, callback = std::move(callback)](auto value) { if (!_listen) { _level->requestPaintProgress(value); @@ -1589,7 +1596,11 @@ void VoiceRecordBar::visibilityAnimate(bool show, Fn &&callback) { } } }; - _showAnimation.start(std::move(animationCallback), from, to, duration); + _showAnimation.start( + std::move(animationCallback), + from, + to, + st::universalDuration); } void VoiceRecordBar::setStartRecordingFilter(FilterCallback &&callback) { diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp index 84d5656394..986ea9d6e1 100644 --- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp +++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp @@ -196,8 +196,8 @@ void VoiceRecordButton::init() { } update(); }; - const auto duration = st::historyRecordVoiceDuration * 2; - _stateChangedAnimation.start(std::move(callback), 0., to, duration); + constexpr auto kDuration = st::universalDuration * 2; + _stateChangedAnimation.start(std::move(callback), 0., to, kDuration); }, lifetime()); } diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_builder.style b/Telegram/SourceFiles/info/userpic/info_userpic_builder.style index e608fc9cf6..10c212733f 100644 --- a/Telegram/SourceFiles/info/userpic/info_userpic_builder.style +++ b/Telegram/SourceFiles/info/userpic/info_userpic_builder.style @@ -66,5 +66,3 @@ userpicBuilderEmojiColorPlus: IconButton(userpicBuilderEmojiColorMinus) { } userpicBuilderEmojiToggleStickersIcon: icon {{ "menu/stickers", emojiIconFg }}; - -userpicBuilderEmojiSlideDuration: 120; diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp index 4e17bef1d9..fbfa8fb7f3 100644 --- a/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp +++ b/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp @@ -137,7 +137,7 @@ void ColorsLine::fillButtons() { wasChosen->setSelectedProgress(1. - progress); } nowChosen->setSelectedProgress(progress); - }, 0., 1., st::userpicBuilderEmojiSlideDuration); + }, 0., 1., st::universalDuration); }); if (i < _colors->size()) { button->setBrush((*_colors)[i]); @@ -164,7 +164,7 @@ void ColorsLine::fillButtons() { setLastChosen(); }); for (const auto &wrap : _wraps) { - wrap->setDuration(st::userpicBuilderEmojiSlideDuration); + wrap->setDuration(st::universalDuration); } } @@ -213,7 +213,7 @@ void ColorsLine::processChange( const auto left = anim::interpolate(wasLeft, nowLeft, value); _wraps[i]->moveToLeft(left, 0); } - }, 0., 1., st::userpicBuilderEmojiSlideDuration); + }, 0., 1., st::universalDuration); } void ColorsLine::setLastChosen() const { diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp index cd98ee5967..7d4f075cc8 100644 --- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp +++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp @@ -493,7 +493,7 @@ not_null CreateUserpicBuilder( 1. - progress); } state->circleButtons[now]->setSelectedProgress(progress); - }, 0., 1., st::userpicBuilderEmojiSlideDuration); + }, 0., 1., st::universalDuration); state->colorIndex = now; const auto result = isSpecial diff --git a/Telegram/SourceFiles/intro/intro.style b/Telegram/SourceFiles/intro/intro.style index ed5c3b2250..bedbad7489 100644 --- a/Telegram/SourceFiles/intro/intro.style +++ b/Telegram/SourceFiles/intro/intro.style @@ -119,7 +119,6 @@ introCodeDigitFont: font(20px); introCodeDigitHeight: 50px; introCodeDigitBorderWidth: 4px; introCodeDigitSkip: 10px; -introCodeDigitAnimatioDuration: 120; introPasswordHint: FlatLabel(introDescription) { textFg: windowFg; diff --git a/Telegram/SourceFiles/intro/intro_code_input.cpp b/Telegram/SourceFiles/intro/intro_code_input.cpp index 968cd87d47..a3964d3cf7 100644 --- a/Telegram/SourceFiles/intro/intro_code_input.cpp +++ b/Telegram/SourceFiles/intro/intro_code_input.cpp @@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/painter.h" #include "ui/rect.h" #include "ui/widgets/popup_menu.h" +#include "styles/style_basic.h" #include "styles/style_intro.h" #include "styles/style_layers.h" // boxRadius @@ -91,7 +92,6 @@ void CodeDigit::setDigit(int digit) { } _dataDigit = digit; if (_viewDigit != digit) { - constexpr auto kDuration = st::introCodeDigitAnimatioDuration; _animation.stop(); if (digit == kDigitNone) { _animation.start([=](float64 value) { @@ -99,10 +99,10 @@ void CodeDigit::setDigit(int digit) { if (!value) { _viewDigit = digit; } - }, 1., 0., kDuration); + }, 1., 0., st::universalDuration); } else { _viewDigit = digit; - _animation.start([=] { update(); }, 0., 1., kDuration); + _animation.start([=] { update(); }, 0, 1., st::universalDuration); } } } diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style index ef46e04055..2cab84839c 100644 --- a/Telegram/SourceFiles/ui/chat/chat.style +++ b/Telegram/SourceFiles/ui/chat/chat.style @@ -632,7 +632,7 @@ historyPollRadio: Radio(defaultRadio) { diameter: 18px; thickness: 2px; skip: 65px; // * 0.1 - duration: 120; + duration: universalDuration; rippleAreaPadding: 8px; } historyPollRadioOpacity: 0.7; diff --git a/Telegram/SourceFiles/ui/controls/send_button.cpp b/Telegram/SourceFiles/ui/controls/send_button.cpp index 2e83de2fc1..90c3348125 100644 --- a/Telegram/SourceFiles/ui/controls/send_button.cpp +++ b/Telegram/SourceFiles/ui/controls/send_button.cpp @@ -40,7 +40,7 @@ void SendButton::setType(Type type) { [=] { update(); }, 0., 1., - st::historyRecordVoiceDuration); + st::universalDuration); setPointerCursor(_type != Type::Slowmode); update(); }