diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index cf7c8a71df..4fc8e8622f 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -7134,7 +7134,7 @@ void HistoryWidget::startItemRevealAnimations() { [=] { revealItemsCallback(); }, 0., 1., - HistoryView::ListWidget::kItemRevealDuration, + st::itemRevealDuration, anim::easeOutCirc); if (item->out() || _history->peer->isSelf()) { _list->theme()->rotateComplexGradientBackground(); diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp index f2ff933bba..4864d6fff1 100644 --- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp +++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp @@ -96,8 +96,6 @@ constexpr auto kClearUserpicsAfter = 50; } // namespace -const crl::time ListWidget::kItemRevealDuration = crl::time(150); - WindowListDelegate::WindowListDelegate( not_null window) : _window(window) { @@ -2009,8 +2007,8 @@ void ListWidget::startItemRevealAnimations() { [=] { revealItemsCallback(); }, 0., 1., - kItemRevealDuration, - anim::easeOutCirc); + st::itemRevealDuration, + anim::easeOutQuint); if (view->data()->out()) { _delegate->listChatTheme()->rotateComplexGradientBackground(); } diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h index f313810626..4ebab44e01 100644 --- a/Telegram/SourceFiles/history/view/history_view_list_widget.h +++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h @@ -292,8 +292,6 @@ public: not_null session, not_null delegate); - static const crl::time kItemRevealDuration; - [[nodiscard]] Main::Session &session() const; [[nodiscard]] not_null controller() const; [[nodiscard]] not_null delegate() const; diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style index 1a59ef2088..12d1584b22 100644 --- a/Telegram/SourceFiles/ui/chat/chat.style +++ b/Telegram/SourceFiles/ui/chat/chat.style @@ -29,6 +29,8 @@ msgShadow: 2px; msgSelectionOffset: 30px; msgSelectionBottomSkip: 5px; +itemRevealDuration: 150; + historyReplyTop: 2px; historyReplyBottom: 2px; historyReplyPreview: 32px; diff --git a/Telegram/SourceFiles/ui/effects/message_sending_animation_controller.cpp b/Telegram/SourceFiles/ui/effects/message_sending_animation_controller.cpp index b73af2e585..ae2750d078 100644 --- a/Telegram/SourceFiles/ui/effects/message_sending_animation_controller.cpp +++ b/Telegram/SourceFiles/ui/effects/message_sending_animation_controller.cpp @@ -11,7 +11,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_session.h" #include "history/history_item.h" #include "history/view/history_view_element.h" -#include "history/view/history_view_list_widget.h" // kItemRevealDuration #include "history/view/media/history_view_media.h" #include "main/main_session.h" #include "mainwidget.h" @@ -194,7 +193,8 @@ Content::Content( std::move(animationCallback), 0., 1., - HistoryView::ListWidget::kItemRevealDuration); + st::itemRevealDuration, + anim::easeOutQuint); } HistoryView::Element *Content::maybeView() const {