RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-04-01 23:00:58 +00:00
Code Issues Projects Releases Wiki Activity

Use new animations engine everywhere.

Browse Source
This commit is contained in:
John Preston 2019-04-02 13:13:30 +04:00
parent a6e96f9a28
commit 99bb09374d
162 changed files with 753 additions and 826 deletions
Telegram/SourceFiles
boxes
background_preview_box.cppbackground_preview_box.hcalendar_box.cppconnection_box.cppedit_color_box.cpplanguage_box.cpppeer_list_box.cpppeer_list_box.hpeer_list_controllers.cpppeer_list_controllers.hsend_files_box.cppshare_box.cppshare_box.hsticker_set_box.cppstickers_box.cppstickers_box.h
calls
calls_box_controller.cppcalls_panel.cppcalls_panel.h
chat_helpers
bot_keyboard.cppemoji_list_widget.cppemoji_sets_manager.cppfield_autocomplete.cppfield_autocomplete.hstickers_list_widget.cppstickers_list_widget.htabbed_panel.cpptabbed_panel.htabbed_selector.cpptabbed_selector.h
dialogs
dialogs_inner_widget.cppdialogs_inner_widget.hdialogs_layout.cppdialogs_row.cppdialogs_row.hdialogs_widget.cppdialogs_widget.h
export/view
export_view_progress.cpp
history
admin_log
history_admin_log_filter.cpphistory_admin_log_inner.cpphistory_admin_log_inner.hhistory_admin_log_section.cpp
feed
history_feed_section.cpphistory_feed_section.h
history_drag_area.cpphistory_drag_area.hhistory_inner_widget.cpphistory_inner_widget.hhistory_item_components.cpphistory_item_components.hhistory_widget.cpphistory_widget.h
media
history_media_file.hhistory_media_gif.cpphistory_media_photo.cpphistory_media_poll.cpphistory_media_poll.hhistory_media_video.cpphistory_media_wall_paper.cpp
view
history_view_list_widget.cpphistory_view_list_widget.hhistory_view_message.cpphistory_view_top_bar_widget.cpphistory_view_top_bar_widget.h
info
feed
info_feed_channels.cppinfo_feed_channels_controllers.cpp
info_top_bar.cppinfo_top_bar.hinfo_wrap_widget.h
profile
info_profile_button.cppinfo_profile_cover.cppinfo_profile_members.cppinfo_profile_members.hinfo_profile_members_controllers.cppinfo_profile_members_controllers.h
inline_bots
inline_bot_layout_internal.cppinline_bot_layout_internal.hinline_results_widget.cppinline_results_widget.h
intro
introwidget.cppintrowidget.h
mainwidget.cppmainwidget.h
media
player
media_player_button.cppmedia_player_button.hmedia_player_float.cppmedia_player_float.hmedia_player_panel.cppmedia_player_panel.hmedia_player_volume_controller.cppmedia_player_volume_controller.hmedia_player_widget.cpp
view
media_view_group_thumbs.cppmedia_view_group_thumbs.hmedia_view_overlay_widget.cpp
overview
overview_layout.cppoverview_layout.h
passport
passport_panel_details_row.cpppassport_panel_details_row.hpassport_panel_edit_scans.cpp
Show More

20
Telegram/SourceFiles/boxes/background_preview_box.cpp
View File

@ -39,8 +39,7 @@ public:
Painter &p,
int left,
int top,
int outerWidth,
crl::time ms) override;
int outerWidth) override;
QImage prepareRippleMask() const override;
bool checkRippleStartPosition(QPoint position) const override;
@ -241,14 +240,13 @@ void ServiceCheck::paint(
Painter &p,
int left,
int top,
int outerWidth,
crl::time ms) {
int outerWidth) {
Frames().paintFrame(
p,
left + _st.margin.left(),
top + _st.margin.top(),
&_st,
currentAnimationValue(ms));
currentAnimationValue());
}
QImage ServiceCheck::prepareRippleMask() const {
@ -507,20 +505,20 @@ void BackgroundPreviewBox::paintEvent(QPaintEvent *e) {
}
if (!color || _paper.isPattern()) {
if (!_scaled.isNull() || setScaledFromThumb()) {
paintImage(p, ms);
paintRadial(p, ms);
paintImage(p);
paintRadial(p);
} else if (!color) {
p.fillRect(e->rect(), st::boxBg);
return;
} else {
// Progress of pattern loading.
paintRadial(p, ms);
paintRadial(p);
}
}
paintTexts(p, ms);
}
void BackgroundPreviewBox::paintImage(Painter &p, crl::time ms) {
void BackgroundPreviewBox::paintImage(Painter &p) {
Expects(!_scaled.isNull());
const auto master = _paper.isPattern()
@ -536,7 +534,7 @@ void BackgroundPreviewBox::paintImage(Painter &p, crl::time ms) {
height() * factor);
const auto guard = gsl::finally([&] { p.setOpacity(1.); });
const auto fade = _fadeIn.current(ms, 1.);
const auto fade = _fadeIn.value(1.);
if (fade < 1. && !_fadeOutThumbnail.isNull()) {
p.drawPixmap(rect(), _fadeOutThumbnail, from);
}
@ -548,7 +546,7 @@ void BackgroundPreviewBox::paintImage(Painter &p, crl::time ms) {
checkBlurAnimationStart();
}
void BackgroundPreviewBox::paintRadial(Painter &p, crl::time ms) {
void BackgroundPreviewBox::paintRadial(Painter &p) {
const auto radial = _radial.animating();
const auto radialOpacity = radial ? _radial.opacity() : 0.;
if (!radial) {

7
Telegram/SourceFiles/boxes/background_preview_box.h
View File

@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/themes/window_theme.h"
#include "history/admin_log/history_admin_log_item.h"
#include "history/view/history_view_element.h"
#include "ui/effects/animations.h"
#include "ui/effects/radial_animation.h"
namespace Ui {
@ -58,8 +59,8 @@ private:
void setScaledFromImage(QImage &&image, QImage &&blurred);
void updateServiceBg(std::optional<QColor> background);
std::optional<QColor> patternBackgroundColor() const;
void paintImage(Painter &p, crl::time ms);
void paintRadial(Painter &p, crl::time ms);
void paintImage(Painter &p);
void paintRadial(Painter &p);
void paintTexts(Painter &p, crl::time ms);
void paintDate(Painter &p);
void createBlurCheckbox();
@ -72,7 +73,7 @@ private:
Data::WallPaper _paper;
QImage _full;
QPixmap _scaled, _blurred, _fadeOutThumbnail;
Animation _fadeIn;
Ui::Animations::Simple _fadeIn;
Ui::RadialAnimation _radial;
base::binary_guard _generating;
std::optional<QColor> _serviceBg;

2
Telegram/SourceFiles/boxes/calendar_box.cpp
View File

@ -320,7 +320,7 @@ void CalendarBox::Inner::paintRows(Painter &p, QRect clip) {
}
return st::windowBgOver;
};
it->second->paint(p, innerLeft, innerTop, width(), ms, &(colorOverride()->c));
it->second->paint(p, innerLeft, innerTop, width(), &(colorOverride()->c));
if (it->second->empty()) {
_ripples.erase(it);
}

22
Telegram/SourceFiles/boxes/connection_box.cpp
View File

@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/wrap/slide_wrap.h"
#include "ui/wrap/vertical_layout.h"
#include "ui/toast/toast.h"
#include "ui/effects/animations.h"
#include "ui/effects/radial_animation.h"
#include "ui/text_options.h"
#include "styles/style_boxes.h"
@ -53,7 +54,7 @@ private:
void setupControls(View &&view);
int countAvailableWidth() const;
void radialAnimationCallback();
void paintCheck(Painter &p, crl::time ms);
void paintCheck(Painter &p);
void showMenu();
View _view;
@ -67,8 +68,8 @@ private:
base::unique_qptr<Ui::DropdownMenu> _menu;
bool _set = false;
Animation _toggled;
Animation _setAnimation;
Ui::Animations::Simple _toggled;
Ui::Animations::Simple _setAnimation;
std::unique_ptr<Ui::InfiniteRadialAnimation> _progress;
std::unique_ptr<Ui::InfiniteRadialAnimation> _checking;
@ -180,8 +181,8 @@ rpl::producer<> ProxyRow::shareClicks() const {
void ProxyRow::setupControls(View &&view) {
updateFields(std::move(view));
_toggled.finish();
_setAnimation.finish();
_toggled.stop();
_setAnimation.stop();
_menuToggle->addClickHandler([=] { showMenu(); });
}
@ -268,9 +269,8 @@ int ProxyRow::resizeGetHeight(int newWidth) {
void ProxyRow::paintEvent(QPaintEvent *e) {
Painter p(this);
const auto ms = crl::now();
if (!_view.deleted) {
paintRipple(p, 0, 0, ms);
paintRipple(p, 0, 0);
}
const auto left = _skipLeft;
@ -281,7 +281,7 @@ void ProxyRow::paintEvent(QPaintEvent *e) {
p.setOpacity(st::stickersRowDisabledOpacity);
}
paintCheck(p, ms);
paintCheck(p);
p.setPen(st::proxyRowTitleFg);
p.setFont(st::semiboldFont);
@ -338,14 +338,14 @@ void ProxyRow::paintEvent(QPaintEvent *e) {
top += st::normalFont->height + st::proxyRowPadding.bottom();
}
void ProxyRow::paintCheck(Painter &p, crl::time ms) {
void ProxyRow::paintCheck(Painter &p) {
const auto loading = _progress
? _progress->computeState()
: Ui::RadialState{ 0., 0, FullArcLength };
const auto toggled = _toggled.current(ms, _view.selected ? 1. : 0.)
const auto toggled = _toggled.value(_view.selected ? 1. : 0.)
* (1. - loading.shown);
const auto _st = &st::defaultRadio;
const auto set = _setAnimation.current(ms, _set ? 1. : 0.);
const auto set = _setAnimation.value(_set ? 1. : 0.);
PainterHighQualityEnabler hq(p);

8
Telegram/SourceFiles/boxes/edit_color_box.cpp
View File

@ -442,7 +442,7 @@ public:
protected:
void correctValue(const QString &was, int wasCursor, QString &now, int &nowCursor) override;
void paintAdditionalPlaceholder(Painter &p, crl::time ms) override;
void paintAdditionalPlaceholder(Painter &p) override;
void wheelEvent(QWheelEvent *e) override;
void keyPressEvent(QKeyEvent *e) override;
@ -501,7 +501,7 @@ void EditColorBox::Field::correctValue(const QString &was, int wasCursor, QStrin
}
}
void EditColorBox::Field::paintAdditionalPlaceholder(Painter &p, crl::time ms) {
void EditColorBox::Field::paintAdditionalPlaceholder(Painter &p) {
p.setFont(_st.font);
p.setPen(_st.placeholderFg);
auto inner = QRect(_st.textMargins.right(), _st.textMargins.top(), width() - 2 * _st.textMargins.right(), height() - _st.textMargins.top() - _st.textMargins.bottom());
@ -565,7 +565,7 @@ public:
protected:
void correctValue(const QString &was, int wasCursor, QString &now, int &nowCursor) override;
void paintAdditionalPlaceholder(Painter &p, crl::time ms) override;
void paintAdditionalPlaceholder(Painter &p) override;
};
@ -606,7 +606,7 @@ void EditColorBox::ResultField::correctValue(const QString &was, int wasCursor,
}
}
void EditColorBox::ResultField::paintAdditionalPlaceholder(Painter &p, crl::time ms) {
void EditColorBox::ResultField::paintAdditionalPlaceholder(Painter &p) {
p.setFont(_st.font);
p.setPen(_st.placeholderFg);
p.drawText(QRect(_st.textMargins.right(), _st.textMargins.top(), width(), height() - _st.textMargins.top() - _st.textMargins.bottom()), "#", style::al_topleft);

7
Telegram/SourceFiles/boxes/language_box.cpp
View File

@ -772,7 +772,6 @@ int Rows::countAvailableWidth() const {
void Rows::paintEvent(QPaintEvent *e) {
Painter p(this);
const auto ms = crl::now();
const auto clip = e->rect();
const auto checkLeft = st::passportRowPadding.left();
@ -801,14 +800,14 @@ void Rows::paintEvent(QPaintEvent *e) {
}
if (row.ripple) {
row.ripple->paint(p, 0, 0, width(), ms);
row.ripple->paint(p, 0, 0, width());
if (row.ripple->empty()) {
row.ripple.reset();
}
}
const auto checkTop = (row.height - st::defaultRadio.diameter) / 2;
row.check->paint(p, checkLeft, checkTop, width(), ms);
row.check->paint(p, checkLeft, checkTop, width());
auto top = st::passportRowPadding.top();
@ -829,7 +828,7 @@ void Rows::paintEvent(QPaintEvent *e) {
p.drawEllipse(menu);
}
if (row.menuToggleRipple) {
row.menuToggleRipple->paint(p, menu.x(), menu.y(), width(), ms);
row.menuToggleRipple->paint(p, menu.x(), menu.y(), width());
if (row.menuToggleRipple->empty()) {
row.menuToggleRipple.reset();
}

11
Telegram/SourceFiles/boxes/peer_list_box.cpp
View File

@ -457,9 +457,9 @@ void PeerListRow::stopLastRipple() {
}
}
void PeerListRow::paintRipple(Painter &p, crl::time ms, int x, int y, int outerWidth) {
void PeerListRow::paintRipple(Painter &p, int x, int y, int outerWidth) {
if (_ripple) {
_ripple->paint(p, x, y, outerWidth, ms);
_ripple->paint(p, x, y, outerWidth);
if (_ripple->empty()) {
_ripple.reset();
}
@ -469,14 +469,13 @@ void PeerListRow::paintRipple(Painter &p, crl::time ms, int x, int y, int outerW
void PeerListRow::paintUserpic(
Painter &p,
const style::PeerListItem &st,
crl::time ms,
int x,
int y,
int outerWidth) {
if (_disabledState == State::DisabledChecked) {
paintDisabledCheckUserpic(p, st, x, y, outerWidth);
} else if (_checkbox) {
_checkbox->paint(p, ms, x, y, outerWidth);
_checkbox->paint(p, x, y, outerWidth);
} else if (_isSavedMessagesChat) {
Ui::EmptyUserpic::PaintSavedMessages(p, x, y, outerWidth, st.photoSize);
} else {
@ -1099,11 +1098,10 @@ crl::time PeerListContent::paintRow(Painter &p, crl::time ms, RowIndex index) {
? _st.item.button.textBgOver
: _st.item.button.textBg;
p.fillRect(0, 0, width(), _rowHeight, bg);
row->paintRipple(p, ms, 0, 0, width());
row->paintRipple(p, 0, 0, width());
row->paintUserpic(
p,
_st.item,
ms,
_st.item.photoPosition.x(),
_st.item.photoPosition.y(),
width());
@ -1143,7 +1141,6 @@ crl::time PeerListContent::paintRow(Painter &p, crl::time ms, RowIndex index) {
auto actionTop = actionMargins.top();
row->paintAction(
p,
ms,
actionLeft,
actionTop,
width(),

4
Telegram/SourceFiles/boxes/peer_list_box.h
View File

@ -92,7 +92,6 @@ public:
}
virtual void paintAction(
Painter &p,
crl::time ms,
int x,
int y,
int outerWidth,
@ -158,11 +157,10 @@ public:
QPoint point,
UpdateCallback updateCallback);
void stopLastRipple();
void paintRipple(Painter &p, crl::time ms, int x, int y, int outerWidth);
void paintRipple(Painter &p, int x, int y, int outerWidth);
void paintUserpic(
Painter &p,
const style::PeerListItem &st,
crl::time ms,
int x,
int y,
int outerWidth);

1
Telegram/SourceFiles/boxes/peer_list_controllers.cpp
View File

@ -122,7 +122,6 @@ QMargins PeerListRowWithLink::actionMargins() const {
void PeerListRowWithLink::paintAction(
Painter &p,
crl::time ms,
int x,
int y,
int outerWidth,

1
Telegram/SourceFiles/boxes/peer_list_controllers.h
View File

@ -42,7 +42,6 @@ private:
QMargins actionMargins() const override;
void paintAction(
Painter &p,
crl::time ms,
int x,
int y,
int outerWidth,

39
Telegram/SourceFiles/boxes/send_files_box.cpp
View File

@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/file_utilities.h"
#include "core/mime_type.h"
#include "core/event_filter.h"
#include "ui/effects/animations.h"
#include "ui/widgets/checkbox.h"
#include "ui/widgets/buttons.h"
#include "ui/widgets/input_fields.h"
@ -122,8 +123,7 @@ public:
int left,
int top,
float64 shrinkProgress,
float64 moveProgress,
crl::time ms);
float64 moveProgress);
void paintPhoto(Painter &p, int left, int top, int outerWidth);
void paintFile(Painter &p, int left, int top, int outerWidth);
@ -157,7 +157,7 @@ private:
int _statusWidth = 0;
bool _isVideo = false;
float64 _suggestedMove = 0.;
Animation _suggestedMoveAnimation;
Ui::Animations::Simple _suggestedMoveAnimation;
int _lastShrinkValue = 0;
};
@ -290,10 +290,8 @@ void AlbumThumb::paintInAlbum(
int left,
int top,
float64 shrinkProgress,
float64 moveProgress,
crl::time ms) {
float64 moveProgress) {
const auto shrink = anim::interpolate(0, _shrinkSize, shrinkProgress);
_suggestedMoveAnimation.step(ms);
_lastShrinkValue = shrink;
const auto geometry = countCurrentGeometry(moveProgress);
const auto x = left + geometry.x();
@ -540,7 +538,7 @@ void AlbumThumb::suggestMove(float64 delta, Fn<void()> callback) {
QRect AlbumThumb::countRealGeometry() const {
const auto addLeft = int(std::round(
_suggestedMoveAnimation.current(_suggestedMove) * _lastShrinkValue));
_suggestedMoveAnimation.value(_suggestedMove) * _lastShrinkValue));
const auto current = _layout.geometry;
const auto realTopLeft = current.topLeft()
+ _albumPosition
@ -562,7 +560,7 @@ QRect AlbumThumb::countCurrentGeometry(float64 progress) const {
}
void AlbumThumb::finishAnimations() {
_suggestedMoveAnimation.finish();
_suggestedMoveAnimation.stop();
}
SingleMediaPreview *SingleMediaPreview::Create(
@ -961,9 +959,9 @@ private:
AlbumThumb *_paintedAbove = nullptr;
QPoint _draggedStartPosition;
mutable Animation _thumbsHeightAnimation;
mutable Animation _shrinkAnimation;
mutable Animation _finishDragAnimation;
mutable Ui::Animations::Simple _thumbsHeightAnimation;
mutable Ui::Animations::Simple _shrinkAnimation;
mutable Ui::Animations::Simple _finishDragAnimation;
};
@ -1087,9 +1085,9 @@ int SendFilesBox::AlbumPreview::orderIndex(
}
void SendFilesBox::AlbumPreview::cancelDrag() {
_thumbsHeightAnimation.finish();
_finishDragAnimation.finish();
_shrinkAnimation.finish();
_thumbsHeightAnimation.stop();
_finishDragAnimation.stop();
_shrinkAnimation.stop();
if (_draggedThumb) {
_draggedThumb->moveInAlbum({ 0, 0 });
_draggedThumb = nullptr;
@ -1164,7 +1162,7 @@ void SendFilesBox::AlbumPreview::updateSize() {
const auto newHeight = [&] {
switch (_sendWay) {
case SendFilesWay::Album:
return int(std::round(_thumbsHeightAnimation.current(
return int(std::round(_thumbsHeightAnimation.value(
_thumbsHeight)));
case SendFilesWay::Photos: return _photosHeight;
case SendFilesWay::Files: return _filesHeight;
@ -1187,20 +1185,17 @@ void SendFilesBox::AlbumPreview::paintEvent(QPaintEvent *e) {
}
void SendFilesBox::AlbumPreview::paintAlbum(Painter &p) const {
const auto ms = crl::now();
const auto shrink = _shrinkAnimation.current(
ms,
_draggedThumb ? 1. : 0.);
const auto moveProgress = _finishDragAnimation.current(ms, 1.);
const auto shrink = _shrinkAnimation.value(_draggedThumb ? 1. : 0.);
const auto moveProgress = _finishDragAnimation.value(1.);
const auto left = contentLeft();
const auto top = contentTop();
for (const auto &thumb : _thumbs) {
if (thumb.get() != _paintedAbove) {
thumb->paintInAlbum(p, left, top, shrink, moveProgress, ms);
thumb->paintInAlbum(p, left, top, shrink, moveProgress);
}
}
if (_paintedAbove) {
_paintedAbove->paintInAlbum(p, left, top, shrink, moveProgress, ms);
_paintedAbove->paintInAlbum(p, left, top, shrink, moveProgress);
}
}

15
Telegram/SourceFiles/boxes/share_box.cpp
View File

@ -85,7 +85,7 @@ private:
PeerData *peer;
Ui::RoundImageCheckbox checkbox;
Text name;
Animation nameActive;
Ui::Animations::Simple nameActive;
};
void notifyPeerUpdated(const Notify::PeerUpdate &update);
@ -93,7 +93,7 @@ private:
int displayedChatsCount() const;
void paintChat(Painter &p, crl::time ms, not_null<Chat*> chat, int index);
void paintChat(Painter &p, not_null<Chat*> chat, int index);
void updateChat(not_null<PeerData*> peer);
void updateChatName(not_null<Chat*> chat, not_null<PeerData*> peer);
void repaintChat(not_null<PeerData*> peer);
@ -732,7 +732,6 @@ void ShareBox::Inner::setActive(int active) {
void ShareBox::Inner::paintChat(
Painter &p,
crl::time ms,
not_null<Chat*> chat,
int index) {
auto x = _rowsLeft + qFloor((index % _columnCount) * _rowWidthReal);
@ -741,9 +740,9 @@ void ShareBox::Inner::paintChat(
auto outerWidth = width();
auto photoLeft = (_rowWidth - (st::sharePhotoCheckbox.imageRadius * 2)) / 2;
auto photoTop = st::sharePhotoTop;
chat->checkbox.paint(p, ms, x + photoLeft, y + photoTop, outerWidth);
chat->checkbox.paint(p, x + photoLeft, y + photoTop, outerWidth);
auto nameActive = chat->nameActive.current(ms, (index == _active) ? 1. : 0.);
auto nameActive = chat->nameActive.value((index == _active) ? 1. : 0.);
p.setPen(anim::pen(st::shareNameFg, st::shareNameActiveFg, nameActive));
auto nameWidth = (_rowWidth - st::shareColumnSkip);
@ -761,7 +760,6 @@ ShareBox::Inner::Chat::Chat(PeerData *peer, Fn<void()> updateCallback)
void ShareBox::Inner::paintEvent(QPaintEvent *e) {
Painter p(this);
auto ms = crl::now();
auto r = e->rect();
p.setClipRect(r);
p.fillRect(r, st::boxBg);
@ -777,7 +775,7 @@ void ShareBox::Inner::paintEvent(QPaintEvent *e) {
if (indexFrom >= indexTo) {
break;
}
paintChat(p, ms, getChat(*i), indexFrom);
paintChat(p, getChat(*i), indexFrom);
++indexFrom;
}
} else {
@ -806,7 +804,7 @@ void ShareBox::Inner::paintEvent(QPaintEvent *e) {
if (indexFrom >= _filtered.size()) {
break;
}
paintChat(p, ms, getChat(_filtered[indexFrom]), indexFrom);
paintChat(p, getChat(_filtered[indexFrom]), indexFrom);
++indexFrom;
}
indexFrom -= filteredSize;
@ -820,7 +818,6 @@ void ShareBox::Inner::paintEvent(QPaintEvent *e) {
}
paintChat(
p,
ms,
d_byUsernameFiltered[indexFrom].get(),
filteredSize + indexFrom);
++indexFrom;

3
Telegram/SourceFiles/boxes/share_box.h
View File

@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/abstract_box.h"
#include "base/observer.h"
#include "base/timer.h"
#include "ui/effects/animations.h"
#include "ui/effects/round_checkbox.h"
namespace Dialogs {
@ -99,6 +100,6 @@ private:
using PeopleQueries = QMap<mtpRequestId, QString>;
PeopleQueries _peopleQueries;
Animation _scrollAnimation;
Ui::Animations::Simple _scrollAnimation;
};

5
Telegram/SourceFiles/boxes/sticker_set_box.cpp
View File

@ -73,7 +73,7 @@ private:
void showPreview();
std::vector<Animation> _packOvers;
std::vector<Ui::Animations::Simple> _packOvers;
Stickers::Pack _pack;
Stickers::ByEmojiMap _emoji;
bool _loaded = false;
@ -460,7 +460,6 @@ void StickerSetBox::Inner::paintEvent(QPaintEvent *e) {
if (_pack.isEmpty()) return;
auto ms = crl::now();
int32 rows = _pack.size() / kStickersPanelPerRow + ((_pack.size() % kStickersPanelPerRow) ? 1 : 0);
int32 from = qFloor(e->rect().top() / st::stickersSize.height()), to = qFloor(e->rect().bottom() / st::stickersSize.height()) + 1;
@ -473,7 +472,7 @@ void StickerSetBox::Inner::paintEvent(QPaintEvent *e) {
DocumentData *doc = _pack.at(index);
QPoint pos(st::stickersPadding.left() + j * st::stickersSize.width(), st::stickersPadding.top() + i * st::stickersSize.height());
if (auto over = _packOvers[index].current(ms, (index == _selected) ? 1. : 0.)) {
if (auto over = _packOvers[index].value((index == _selected) ? 1. : 0.)) {
p.setOpacity(over);
QPoint tl(pos);
if (rtl()) tl.setX(width() - tl.x() - st::stickersSize.width());

27
Telegram/SourceFiles/boxes/stickers_box.cpp
View File

@ -384,7 +384,7 @@ void StickersBox::paintEvent(QPaintEvent *e) {
Painter p(this);
if (_slideAnimation) {
_slideAnimation->paintFrame(p, 0, getTopSkip(), width(), crl::now());
_slideAnimation->paintFrame(p, 0, getTopSkip(), width());
if (!_slideAnimation->animating()) {
_slideAnimation.reset();
setInnerVisible(true);
@ -715,14 +715,13 @@ void StickersBox::Inner::paintEvent(QPaintEvent *e) {
Painter p(this);
auto clip = e->rect();
auto ms = crl::now();
p.fillRect(clip, st::boxBg);
p.setClipRect(clip);
if (_megagroupSelectedSet) {
auto setTop = _megagroupDivider->y() - _rowHeight;
p.translate(0, setTop);
paintRow(p, _megagroupSelectedSet.get(), -1, ms);
paintRow(p, _megagroupSelectedSet.get(), -1);
p.translate(0, -setTop);
}
@ -740,13 +739,13 @@ void StickersBox::Inner::paintEvent(QPaintEvent *e) {
p.translate(0, from * _rowHeight);
for (int32 i = from; i < to; ++i) {
if (i != _above) {
paintRow(p, _rows[i].get(), i, ms);
paintRow(p, _rows[i].get(), i);
}
p.translate(0, _rowHeight);
}
if (from <= _above && _above < to) {
p.translate(0, (_above - to) * _rowHeight);
paintRow(p, _rows[_above].get(), _above, ms);
paintRow(p, _rows[_above].get(), _above);
}
}
}
@ -790,7 +789,7 @@ QRect StickersBox::Inner::relativeButtonRect(bool removeButton) const {
return QRect(buttonx, buttony, buttonw, buttonh);
}
void StickersBox::Inner::paintRow(Painter &p, Row *set, int index, crl::time ms) {
void StickersBox::Inner::paintRow(Painter &p, Row *set, int index) {
auto xadd = 0, yadd = qRound(set->yadd.current());
if (xadd || yadd) p.translate(xadd, yadd);
@ -804,7 +803,7 @@ void StickersBox::Inner::paintRow(Painter &p, Row *set, int index, crl::time ms)
if (index >= 0 && index == selectedIndex) {
p.fillRect(0, 0, width(), _rowHeight, st::contactsBgOver);
if (set->ripple) {
set->ripple->paint(p, 0, 0, width(), ms);
set->ripple->paint(p, 0, 0, width());
}
}
}
@ -827,13 +826,13 @@ void StickersBox::Inner::paintRow(Painter &p, Row *set, int index, crl::time ms)
App::roundRect(p, row, st::boxBg, BoxCorners);
p.setOpacity(1. - current);
paintFakeButton(p, set, index, ms);
paintFakeButton(p, set, index);
p.setOpacity(1.);
} else if (!_megagroupSet) {
paintFakeButton(p, set, index, ms);
paintFakeButton(p, set, index);
}
} else if (!_megagroupSet) {
paintFakeButton(p, set, index, ms);
paintFakeButton(p, set, index);
}
if (set->removed && _section == Section::Installed) {
@ -893,7 +892,7 @@ void StickersBox::Inner::paintRow(Painter &p, Row *set, int index, crl::time ms)
if (xadd || yadd) p.translate(-xadd, -yadd);
}
void StickersBox::Inner::paintFakeButton(Painter &p, Row *set, int index, crl::time ms) {
void StickersBox::Inner::paintFakeButton(Painter &p, Row *set, int index) {
auto removeButton = (_section == Section::Installed && !set->removed);
auto rect = relativeButtonRect(removeButton);
if (_section != Section::Installed && set->installed && !set->archived && !set->removed) {
@ -906,7 +905,7 @@ void StickersBox::Inner::paintFakeButton(Painter &p, Row *set, int index, crl::t
if (removeButton) {
// Trash icon button when not disabled in Installed.
if (set->ripple) {
set->ripple->paint(p, rect.x(), rect.y(), width(), ms);
set->ripple->paint(p, rect.x(), rect.y(), width());
if (set->ripple->empty()) {
set->ripple.reset();
}
@ -915,7 +914,7 @@ void StickersBox::Inner::paintFakeButton(Painter &p, Row *set, int index, crl::t
auto position = st::stickersRemove.iconPosition;
if (position.x() < 0) position.setX((rect.width() - icon.width()) / 2);
if (position.y() < 0) position.setY((rect.height() - icon.height()) / 2);
icon.paint(p, rect.topLeft() + position, ms);
icon.paint(p, rect.topLeft() + position, width());
} else {
// Round button ADD when not installed from Trending or Archived.
// Or round button UNDO after disabled from Installed.
@ -925,7 +924,7 @@ void StickersBox::Inner::paintFakeButton(Painter &p, Row *set, int index, crl::t
auto &textBg = selected ? st.textBgOver : st.textBg;
App::roundRect(p, myrtlrect(rect), textBg, ImageRoundRadius::Small);
if (set->ripple) {
set->ripple->paint(p, rect.x(), rect.y(), width(), ms);
set->ripple->paint(p, rect.x(), rect.y(), width());
if (set->ripple->empty()) {
set->ripple.reset();
}

4
Telegram/SourceFiles/boxes/stickers_box.h
View File

@ -272,8 +272,8 @@ private:
void ensureRipple(const style::RippleAnimation &st, QImage mask, bool removeButton);
bool shiftingAnimationCallback(crl::time now);
void paintRow(Painter &p, Row *set, int index, crl::time ms);
void paintFakeButton(Painter &p, Row *set, int index, crl::time ms);
void paintRow(Painter &p, Row *set, int index);
void paintFakeButton(Painter &p, Row *set, int index);
void clear();
void setActionSel(int32 actionSel);
float64 aboveShadowOpacity() const;

4
Telegram/SourceFiles/calls/calls_box_controller.cpp
View File

@ -97,7 +97,6 @@ public:
}
void paintAction(
Painter &p,
crl::time ms,
int x,
int y,
int outerWidth,
@ -143,7 +142,6 @@ void BoxController::Row::paintStatusText(Painter &p, const style::PeerListItem &
void BoxController::Row::paintAction(
Painter &p,
crl::time ms,
int x,
int y,
int outerWidth,
@ -151,7 +149,7 @@ void BoxController::Row::paintAction(
bool actionSelected) {
auto size = actionSize();
if (_actionRipple) {
_actionRipple->paint(p, x + st::callReDial.rippleAreaPosition.x(), y + st::callReDial.rippleAreaPosition.y(), outerWidth, ms);
_actionRipple->paint(p, x + st::callReDial.rippleAreaPosition.x(), y + st::callReDial.rippleAreaPosition.y(), outerWidth);
if (_actionRipple->empty()) {
_actionRipple.reset();
}

11
Telegram/SourceFiles/calls/calls_panel.cpp
View File

@ -66,7 +66,7 @@ private:
QImage _iconMixedMask, _iconFrom, _iconTo, _iconMixed;
float64 _outerValue = 0.;
Animation _outerAnimation;
Ui::Animations::Simple _outerAnimation;
};
@ -186,12 +186,11 @@ void Panel::Button::setProgress(float64 progress) {
void Panel::Button::paintEvent(QPaintEvent *e) {
Painter p(this);
auto ms = crl::now();
auto bgPosition = myrtlpoint(_stFrom->button.rippleAreaPosition);
auto paintFrom = (_progress == 0.) || !_stTo;
auto paintTo = !paintFrom && (_progress == 1.);
auto outerValue = _outerAnimation.current(ms, _outerValue);
auto outerValue = _outerAnimation.value(_outerValue);
if (outerValue > 0.) {
auto outerRadius = paintFrom ? _stFrom->outerRadius : paintTo ? _stTo->outerRadius : (_stFrom->outerRadius * (1. - _progress) + _stTo->outerRadius * _progress);
auto outerPixels = outerValue * outerRadius;
@ -228,7 +227,7 @@ void Panel::Button::paintEvent(QPaintEvent *e) {
} else {
rippleColorInterpolated = anim::color(_stFrom->button.ripple.color, _stTo->button.ripple.color, _progress);
}
paintRipple(p, _stFrom->button.rippleAreaPosition.x(), _stFrom->button.rippleAreaPosition.y(), ms, rippleColorOverride);
paintRipple(p, _stFrom->button.rippleAreaPosition.x(), _stFrom->button.rippleAreaPosition.y(), rippleColorOverride);
auto positionFrom = iconPosition(_stFrom);
if (paintFrom) {
@ -681,7 +680,7 @@ void Panel::updateHangupGeometry() {
auto bothWidth = singleWidth + st::callControlsSkip + st::callCancel.button.width;
auto rightFrom = (width() - bothWidth) / 2;
auto rightTo = (width() - singleWidth) / 2;
auto hangupProgress = _hangupShownProgress.current(_hangupShown ? 1. : 0.);
auto hangupProgress = _hangupShownProgress.value(_hangupShown ? 1. : 0.);
auto hangupRight = anim::interpolate(rightFrom, rightTo, hangupProgress);
auto controlsTop = _contentTop + st::callControlsTop;
_answerHangupRedial->moveToRight(hangupRight, controlsTop);
@ -695,7 +694,7 @@ void Panel::updateStatusGeometry() {
void Panel::paintEvent(QPaintEvent *e) {
Painter p(this);
if (!_animationCache.isNull()) {
auto opacity = _opacityAnimation.current(crl::now(), _call ? 1. : 0.);
auto opacity = _opacityAnimation.value(_call ? 1. : 0.);
if (!_opacityAnimation.animating()) {
finishAnimating();
if (!_call || isHidden()) return;

5
Telegram/SourceFiles/calls/calls_panel.h
View File

@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/timer.h"
#include "calls/calls_call.h"
#include "ui/widgets/tooltip.h"
#include "ui/effects/animations.h"
#include "ui/rp_widget.h"
namespace Ui {
@ -126,7 +127,7 @@ private:
object_ptr<Ui::FadeWrap<Button>> _decline;
object_ptr<Ui::FadeWrap<Button>> _cancel;
bool _hangupShown = false;
Animation _hangupShownProgress;
Ui::Animations::Simple _hangupShownProgress;
object_ptr<Ui::IconButton> _mute;
object_ptr<Ui::FlatLabel> _name;
object_ptr<Ui::FlatLabel> _status;
@ -142,7 +143,7 @@ private:
PhotoId _userPhotoId = 0;
bool _userPhotoFull = false;
Animation _opacityAnimation;
Ui::Animations::Simple _opacityAnimation;
QPixmap _animationCache;
QPixmap _bottomCache;
QPixmap _cache;

2
Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
View File

@ -110,7 +110,7 @@ void BotKeyboard::paintEvent(QPaintEvent *e) {
if (_impl) {
int x = rtl() ? st::botKbScroll.width : _st->margin;
p.translate(x, st::botKbScroll.deltat);
_impl->paint(p, width(), clip.translated(-x, -st::botKbScroll.deltat), crl::now());
_impl->paint(p, width(), clip.translated(-x, -st::botKbScroll.deltat));
}
}

7
Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
View File

@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#include "chat_helpers/emoji_list_widget.h"
#include "ui/effects/animations.h"
#include "ui/widgets/buttons.h"
#include "ui/widgets/shadow.h"
#include "ui/emoji_config.h"
@ -62,7 +63,7 @@ private:
bool _hiding = false;
QPixmap _cache;
Animation _a_opacity;
Ui::Animations::Simple _a_opacity;
rpl::event_stream<EmojiPtr> _chosen;
rpl::event_stream<> _hidden;
@ -186,7 +187,7 @@ void EmojiColorPicker::updateSize() {
void EmojiColorPicker::paintEvent(QPaintEvent *e) {
Painter p(this);
auto opacity = _a_opacity.current(crl::now(), _hiding ? 0. : 1.);
auto opacity = _a_opacity.value(_hiding ? 0. : 1.);
if (opacity < 1.) {
if (opacity > 0.) {
p.setOpacity(opacity);
@ -272,7 +273,7 @@ void EmojiColorPicker::animationCallback() {
void EmojiColorPicker::hideFast() {
clearSelection();
_a_opacity.finish();
_a_opacity.stop();
_cache = QPixmap();
hide();
_hidden.fire({});

35
Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp
View File

@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/wrap/fade_wrap.h"
#include "ui/widgets/buttons.h"
#include "ui/widgets/labels.h"
#include "ui/effects/animations.h"
#include "ui/effects/radial_animation.h"
#include "ui/emoji_config.h"
#include "lang/lang_keys.h"
@ -119,8 +120,8 @@ private:
void setupPreview(const Set &set);
void setupAnimation();
void paintPreview(Painter &p) const;
void paintRadio(Painter &p, crl::time ms);
void updateAnimation(crl::time ms);
void paintRadio(Painter &p, crl::time now);
void updateAnimation(crl::time now);
void setupHandler();
void load();
@ -131,8 +132,8 @@ private:
rpl::variable<SetState> _state;
Ui::FlatLabel *_status = nullptr;
std::array<QPixmap, 4> _preview;
Animation _toggled;
Animation _active;
Ui::Animations::Simple _toggled;
Ui::Animations::Simple _active;
std::unique_ptr<Ui::RadialAnimation> _loading;
};
@ -355,11 +356,9 @@ void Row::paintEvent(QPaintEvent *e) {
const auto bg = over ? st::windowBgOver : st::windowBg;
p.fillRect(rect(), bg);
const auto ms = crl::now();
paintRipple(p, 0, 0, ms);
paintRipple(p, 0, 0);
paintPreview(p);
paintRadio(p, ms);
paintRadio(p, crl::now());
}
void Row::paintPreview(Painter &p) const {
@ -377,16 +376,16 @@ void Row::paintPreview(Painter &p) const {
}
}
void Row::paintRadio(Painter &p, crl::time ms) {
updateAnimation(ms);
void Row::paintRadio(Painter &p, crl::time now) {
updateAnimation(now);
const auto loading = _loading
? _loading->computeState()
: Ui::RadialState{ 0., 0, FullArcLength };
const auto isToggledSet = _state.current().is<Active>();
const auto isActiveSet = isToggledSet || _state.current().is<Loading>();
const auto toggled = _toggled.current(ms, isToggledSet ? 1. : 0.);
const auto active = _active.current(ms, isActiveSet ? 1. : 0.);
const auto toggled = _toggled.value(isToggledSet ? 1. : 0.);
const auto active = _active.value(isActiveSet ? 1. : 0.);
const auto _st = &st::defaultRadio;
PainterHighQualityEnabler hq(p);
@ -466,7 +465,7 @@ void Row::onStateChanged(State was, StateChangeSource source) {
void Row::updateStatusColorOverride() {
const auto isToggledSet = _state.current().is<Active>();
const auto toggled = _toggled.current(isToggledSet ? 1. : 0.);
const auto toggled = _toggled.value(isToggledSet ? 1. : 0.);
const auto over = showOver();
if (toggled == 0. && !over) {
_status->setTextColorOverride(std::nullopt);
@ -620,12 +619,12 @@ void Row::setupAnimation() {
st::defaultRadio.duration);
}, lifetime());
_toggled.finish();
_active.finish();
_toggled.stop();
_active.stop();
updateStatusColorOverride();
}
void Row::updateAnimation(crl::time ms) {
void Row::updateAnimation(crl::time now) {
const auto state = _state.current();
if (const auto loading = base::get_if<Loading>(&state)) {
const auto progress = (loading->size > 0)
@ -636,10 +635,10 @@ void Row::updateAnimation(crl::time ms) {
[=] { radialAnimationCallback(); });
_loading->start(progress);
} else {
_loading->update(progress, false, crl::now());
_loading->update(progress, false, now);
}
} else if (_loading) {
_loading->update(state.is<Failed>() ? 0. : 1., true, crl::now());
_loading->update(state.is<Failed>() ? 0. : 1., true, now);
} else {
_loading = nullptr;
}

15
Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
View File

@ -47,7 +47,7 @@ FieldAutocomplete::FieldAutocomplete(QWidget *parent) : TWidget(parent)
void FieldAutocomplete::paintEvent(QPaintEvent *e) {
Painter p(this);
auto opacity = _a_opacity.current(crl::now(), _hiding ? 0. : 1.);
auto opacity = _a_opacity.value(_hiding ? 0. : 1.);
if (opacity < 1.) {
if (opacity > 0.) {
p.setOpacity(opacity);
@ -234,15 +234,15 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
bool listAllSuggestions = _filter.isEmpty();
auto &recent(cRecentWriteHashtags());
hrows.reserve(recent.size());
for (auto i = recent.cbegin(), e = recent.cend(); i != e; ++i) {
for (const auto &[tag, ratio] : recent) {
if (!listAllSuggestions
&& (i->first.size() == _filter.size()
|| !TextUtilities::RemoveAccents(i->first).startsWith(
&& (tag.size() == _filter.size()
|| !TextUtilities::RemoveAccents(tag).startsWith(
_filter,
Qt::CaseInsensitive))) {
continue;
}
hrows.push_back(i->first);
hrows.push_back(tag);
}
} else if (_type == Type::BotCommands) {
bool listAllSuggestions = _filter.isEmpty();
@ -290,8 +290,7 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
brows.reserve(cnt);
int32 botStatus = _chat ? _chat->botStatus : ((_channel && _channel->isMegagroup()) ? _channel->mgInfo->botStatus : -1);
if (_chat) {
for (auto i = _chat->lastAuthors.cbegin(), e = _chat->lastAuthors.cend(); i != e; ++i) {
auto user = *i;
for (const auto &user : _chat->lastAuthors) {
if (!user->botInfo) continue;
if (!bots.contains(user)) continue;
if (!user->botInfo->inited) {
@ -396,7 +395,7 @@ void FieldAutocomplete::recount(bool resetScroll) {
}
void FieldAutocomplete::hideFast() {
_a_opacity.finish();
_a_opacity.stop();
hideFinish();
}

3
Telegram/SourceFiles/chat_helpers/field_autocomplete.h
View File

@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
#include "ui/effects/animations.h"
#include "ui/twidget.h"
#include "base/timer.h"
#include "chat_helpers/stickers.h"
@ -123,7 +124,7 @@ private:
int32 _width, _height;
bool _hiding = false;
Animation _a_opacity;
Ui::Animations::Simple _a_opacity;
friend class internal::FieldAutocompleteInner;

11
Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
View File

@ -1170,7 +1170,6 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
toColumn = _columnCount - toColumn;
}
auto ms = crl::now();
auto &sets = shownSets();
auto selectedSticker = base::get_if<OverSticker>(&_selected);
auto selectedButton = base::get_if<OverButton>(_pressed ? &_pressed : &_selected);
@ -1199,7 +1198,7 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
App::roundRect(p, myrtlrect(add), textBg, ImageRoundRadius::Small);
if (set.ripple) {
set.ripple->paint(p, add.x(), add.y(), width(), ms);
set.ripple->paint(p, add.x(), add.y(), width());
if (set.ripple->empty()) {
set.ripple.reset();
}
@ -1266,7 +1265,7 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
auto remove = removeButtonRect(info.section);
auto selected = selectedButton ? (selectedButton->section == info.section) : false;
if (set.ripple) {
set.ripple->paint(p, remove.x() + st::stickerPanRemoveSet.rippleAreaPosition.x(), remove.y() + st::stickerPanRemoveSet.rippleAreaPosition.y(), width(), ms);
set.ripple->paint(p, remove.x() + st::stickerPanRemoveSet.rippleAreaPosition.x(), remove.y() + st::stickerPanRemoveSet.rippleAreaPosition.y(), width());
if (set.ripple->empty()) {
set.ripple.reset();
}
@ -1286,7 +1285,7 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
if (clip.top() + clip.height() > info.rowsTop) {
if (set.id == Stickers::MegagroupSetId && set.pack.empty()) {
auto buttonSelected = (base::get_if<OverGroupAdd>(&_selected) != nullptr);
paintMegagroupEmptySet(p, info.rowsTop, buttonSelected, ms);
paintMegagroupEmptySet(p, info.rowsTop, buttonSelected);
} else {
auto special = (set.flags & MTPDstickerSet::Flag::f_official) != 0;
auto fromRow = floorclamp(clip.y() - info.rowsTop, _singleSize.height(), 0, info.rowsCount);
@ -1328,7 +1327,7 @@ int StickersListWidget::megagroupSetInfoLeft() const {
return st::emojiPanHeaderLeft - st::buttonRadius;
}
void StickersListWidget::paintMegagroupEmptySet(Painter &p, int y, bool buttonSelected, crl::time ms) {
void StickersListWidget::paintMegagroupEmptySet(Painter &p, int y, bool buttonSelected) {
auto infoLeft = megagroupSetInfoLeft();
_megagroupSetAbout.drawLeft(p, infoLeft, y, width() - infoLeft, width());
@ -1339,7 +1338,7 @@ void StickersListWidget::paintMegagroupEmptySet(Painter &p, int y, bool buttonSe
auto button = _megagroupSetButtonRect.translated(0, y);
App::roundRect(p, myrtlrect(button), textBg, ImageRoundRadius::Small);
if (_megagroupSetButtonRipple) {
_megagroupSetButtonRipple->paint(p, button.x(), button.y(), width(), ms);
_megagroupSetButtonRipple->paint(p, button.x(), button.y(), width());
if (_megagroupSetButtonRipple->empty()) {
_megagroupSetButtonRipple.reset();
}

2
Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
View File

@ -201,7 +201,7 @@ private:
void paintFeaturedStickers(Painter &p, QRect clip);
void paintStickers(Painter &p, QRect clip);
void paintMegagroupEmptySet(Painter &p, int y, bool buttonSelected, crl::time ms);
void paintMegagroupEmptySet(Painter &p, int y, bool buttonSelected);
void paintSticker(Painter &p, Set &set, int y, int index, bool selected, bool deleteSelected);
void paintEmptySearchResults(Painter &p);

22
Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
View File

@ -155,12 +155,10 @@ void TabbedPanel::windowActiveChanged() {
void TabbedPanel::paintEvent(QPaintEvent *e) {
Painter p(this);
auto ms = crl::now();
// This call can finish _a_show animation and destroy _showAnimation.
auto opacityAnimating = _a_opacity.animating(ms);
auto opacityAnimating = _a_opacity.animating();
auto showAnimating = _a_show.animating(ms);
auto showAnimating = _a_show.animating();
if (_showAnimation && !showAnimating) {
_showAnimation.reset();
if (!opacityAnimating && !isDestroying()) {
@ -171,11 +169,11 @@ void TabbedPanel::paintEvent(QPaintEvent *e) {
if (showAnimating) {
Assert(_showAnimation != nullptr);
if (auto opacity = _a_opacity.current(_hiding ? 0. : 1.)) {
_showAnimation->paintFrame(p, 0, 0, width(), _a_show.current(1.), opacity);
if (auto opacity = _a_opacity.value(_hiding ? 0. : 1.)) {
_showAnimation->paintFrame(p, 0, 0, width(), _a_show.value(1.), opacity);
}
} else if (opacityAnimating) {
p.setOpacity(_a_opacity.current(_hiding ? 0. : 1.));
p.setOpacity(_a_opacity.value(_hiding ? 0. : 1.));
p.drawPixmap(0, 0, _cache);
} else if (_hiding || isHidden()) {
hideFinished();
@ -208,8 +206,7 @@ void TabbedPanel::leaveEventHook(QEvent *e) {
if (preventAutoHide()) {
return;
}
auto ms = crl::now();
if (_a_show.animating(ms) || _a_opacity.animating(ms)) {
if (_a_show.animating() || _a_opacity.animating()) {
hideAnimated();
} else {
_hideTimer.callOnce(kHideTimeoutMs);
@ -226,8 +223,7 @@ void TabbedPanel::otherLeave() {
return;
}
auto ms = crl::now();
if (_a_opacity.animating(ms)) {
if (_a_opacity.animating()) {
hideByTimerOrLeave();
} else {
_hideTimer.callOnce(0);
@ -239,7 +235,7 @@ void TabbedPanel::hideFast() {
_hideTimer.cancel();
_hiding = false;
_a_opacity.finish();
_a_opacity.stop();
hideFinished();
}
@ -363,7 +359,7 @@ QPointer<TabbedSelector> TabbedPanel::getSelector() const {
void TabbedPanel::hideFinished() {
hide();
_a_show.finish();
_a_show.stop();
_showAnimation.reset();
_cache = QPixmap();
_hiding = false;

5
Telegram/SourceFiles/chat_helpers/tabbed_panel.h
View File

@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
#include "ui/effects/animations.h"
#include "ui/rp_widget.h"
#include "base/timer.h"
@ -99,12 +100,12 @@ private:
int _maxContentHeight = 0;
std::unique_ptr<Ui::PanelAnimation> _showAnimation;
Animation _a_show;
Ui::Animations::Simple _a_show;
bool _hiding = false;
bool _hideAfterSlide = false;
QPixmap _cache;
Animation _a_opacity;
Ui::Animations::Simple _a_opacity;
base::Timer _hideTimer;
};

12
Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
View File

@ -494,11 +494,9 @@ void TabbedSelector::updateRestrictedLabelGeometry() {
void TabbedSelector::paintEvent(QPaintEvent *e) {
Painter p(this);
auto ms = crl::now();
auto switching = (_slideAnimation != nullptr);
if (switching) {
paintSlideFrame(p, ms);
paintSlideFrame(p);
if (!_a_slide.animating()) {
_slideAnimation.reset();
afterShown();
@ -509,7 +507,7 @@ void TabbedSelector::paintEvent(QPaintEvent *e) {
}
}
void TabbedSelector::paintSlideFrame(Painter &p, crl::time ms) {
void TabbedSelector::paintSlideFrame(Painter &p) {
if (_roundRadius > 0) {
if (full()) {
auto topPart = QRect(0, 0, width(), _tabsSlider->height() + _roundRadius);
@ -521,7 +519,7 @@ void TabbedSelector::paintSlideFrame(Painter &p, crl::time ms) {
} else if (full()) {
p.fillRect(0, 0, width(), _tabsSlider->height(), st::emojiPanBg);
}
auto slideDt = _a_slide.current(ms, 1.);
auto slideDt = _a_slide.value(1.);
_slideAnimation->paintFrame(p, slideDt, 1.);
}
@ -621,7 +619,7 @@ void TabbedSelector::hideFinished() {
}
tab.widget()->panelHideFinished();
}
_a_slide.finish();
_a_slide.stop();
_slideAnimation.reset();
}
@ -631,7 +629,7 @@ void TabbedSelector::showStarted() {
}
currentTab()->widget()->refreshRecent();
currentTab()->widget()->preloadImages();
_a_slide.finish();
_a_slide.stop();
_slideAnimation.reset();
showAll();
}

5
Telegram/SourceFiles/chat_helpers/tabbed_selector.h
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#pragma once
#include "ui/rp_widget.h"
#include "ui/effects/animations.h"
#include "ui/effects/panel_animation.h"
#include "mtproto/sender.h"
#include "auth_session.h"
@ -149,7 +150,7 @@ private:
SelectorTab type,
not_null<Window::Controller*> controller);
void paintSlideFrame(Painter &p, crl::time ms);
void paintSlideFrame(Painter &p);
void paintContent(Painter &p);
void checkRestrictedPeer();
@ -191,7 +192,7 @@ private:
class SlideAnimation;
std::unique_ptr<SlideAnimation> _slideAnimation;
Animation _a_slide;
Ui::Animations::Simple _a_slide;
object_ptr<Ui::SettingsSlider> _tabsSlider = { nullptr };
object_ptr<Ui::PlainShadow> _topShadow;

14
Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
View File

@ -368,7 +368,7 @@ void DialogsInner::paintRegion(Painter &p, const QRegion &region, bool paintingO
auto &result = _hashtagResults[from];
bool selected = (from == (isPressed() ? _hashtagPressed : _hashtagSelected));
p.fillRect(0, 0, fullWidth, st::mentionHeight, selected ? st::mentionBgOver : st::dialogsBg);
result->row.paintRipple(p, 0, 0, fullWidth, ms);
result->row.paintRipple(p, 0, 0, fullWidth);
if (!paintingOther) {
auto &tag = result->tag;
if (selected) {
@ -456,14 +456,14 @@ void DialogsInner::paintRegion(Painter &p, const QRegion &region, bool paintingO
const auto selected = (from == (isPressed()
? _peerSearchPressed
: _peerSearchSelected));
paintPeerSearchResult(p, result.get(), fullWidth, active, selected, paintingOther, ms);
paintPeerSearchResult(p, result.get(), fullWidth, active, selected, paintingOther);
p.translate(0, st::dialogsRowHeight);
}
}
}
if (_searchInChat) {
paintSearchInChat(p, fullWidth, paintingOther, ms);
paintSearchInChat(p, fullWidth, paintingOther);
p.translate(0, searchInChatSkip());
if (_waitingForSearch && _searchResults.empty()) {
p.fillRect(
@ -549,12 +549,11 @@ void DialogsInner::paintPeerSearchResult(
int fullWidth,
bool active,
bool selected,
bool onlyBackground,
crl::time ms) const {
bool onlyBackground) const {
QRect fullRect(0, 0, fullWidth, st::dialogsRowHeight);
p.fillRect(fullRect, active ? st::dialogsBgActive : (selected ? st::dialogsBgOver : st::dialogsBg));
if (!active) {
result->row.paintRipple(p, 0, 0, fullWidth, ms);
result->row.paintRipple(p, 0, 0, fullWidth);
}
if (onlyBackground) return;
@ -605,8 +604,7 @@ void DialogsInner::paintPeerSearchResult(
void DialogsInner::paintSearchInChat(
Painter &p,
int fullWidth,
bool onlyBackground,
crl::time ms) const {
bool onlyBackground) const {
auto height = searchInChatSkip();
auto top = st::searchedBarHeight;

6
Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
View File

@ -236,13 +236,11 @@ private:
int fullWidth,
bool active,
bool selected,
bool onlyBackground,
crl::time ms) const;
bool onlyBackground) const;
void paintSearchInChat(
Painter &p,
int fullWidth,
bool onlyBackground,
crl::time ms) const;
bool onlyBackground) const;
void paintSearchInPeer(
Painter &p,
not_null<PeerData*> peer,

2
Telegram/SourceFiles/dialogs/dialogs_layout.cpp
View File

@ -202,7 +202,7 @@ void paintRow(
? st::dialogsRippleBgActive
: st::dialogsRippleBg;
p.fillRect(fullRect, bg);
row->paintRipple(p, 0, 0, fullWidth, ms, &ripple->c);
row->paintRipple(p, 0, 0, fullWidth, &ripple->c);
if (flags & Flag::OnlyBackground) {
return;

4
Telegram/SourceFiles/dialogs/dialogs_row.cpp
View File

@ -31,9 +31,9 @@ void RippleRow::stopLastRipple() {
}
}
void RippleRow::paintRipple(Painter &p, int x, int y, int outerWidth, crl::time ms, const QColor *colorOverride) const {
void RippleRow::paintRipple(Painter &p, int x, int y, int outerWidth, const QColor *colorOverride) const {
if (_ripple) {
_ripple->paint(p, x, y, outerWidth, ms, colorOverride);
_ripple->paint(p, x, y, outerWidth, colorOverride);
if (_ripple->empty()) {
_ripple.reset();
}

2
Telegram/SourceFiles/dialogs/dialogs_row.h
View File

@ -30,7 +30,7 @@ public:
void addRipple(QPoint origin, QSize size, Fn<void()> updateCallback);
void stopLastRipple();
void paintRipple(Painter &p, int x, int y, int outerWidth, crl::time ms, const QColor *colorOverride = nullptr) const;
void paintRipple(Painter &p, int x, int y, int outerWidth, const QColor *colorOverride = nullptr) const;
private:
mutable std::unique_ptr<Ui::RippleAnimation> _ripple;

12
Telegram/SourceFiles/dialogs/dialogs_widget.cpp
View File

@ -125,7 +125,7 @@ void DialogsWidget::BottomButton::paintEvent(QPaintEvent *e) {
p.fillRect(r, over ? _st.overBgColor : _st.bgColor);
if (!isDisabled()) {
paintRipple(p, 0, 0, crl::now());
paintRipple(p, 0, 0);
}
p.setFont(over ? _st.overFont : _st.font);
@ -333,7 +333,7 @@ void DialogsWidget::dialogsToUp() {
return;
}
if (_filter->getLastText().trimmed().isEmpty() && !_searchInChat) {
_scrollToAnimation.finish();
_scrollToAnimation.stop();
auto scrollTop = _scroll->scrollTop();
const auto scrollTo = 0;
const auto maxAnimatedDelta = _scroll->height();
@ -342,8 +342,8 @@ void DialogsWidget::dialogsToUp() {
_scroll->scrollToY(scrollTop);
}
const auto scroll = [&] {
_scroll->scrollToY(qRound(_scrollToAnimation.current()));
const auto scroll = [=] {
_scroll->scrollToY(qRound(_scrollToAnimation.value(scrollTo)));
};
_scrollToAnimation.start(
@ -394,7 +394,7 @@ void DialogsWidget::showFast() {
void DialogsWidget::showAnimated(Window::SlideDirection direction, const Window::SectionSlideParams &params) {
_showDirection = direction;
_a_show.finish();
_a_show.stop();
_cacheUnder = params.oldContentCache;
show();
@ -1448,7 +1448,7 @@ void DialogsWidget::paintEvent(QPaintEvent *e) {
if (r != rect()) {
p.setClipRect(r);
}
auto progress = _a_show.current(crl::now(), 1.);
auto progress = _a_show.value(1.);
if (_a_show.animating()) {
auto retina = cIntRetinaFactor();
auto fromLeft = (_showDirection == Window::SlideDirection::FromLeft);

5
Telegram/SourceFiles/dialogs/dialogs_widget.h
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#pragma once
#include "window/section_widget.h"
#include "ui/effects/animations.h"
#include "ui/widgets/scroll_area.h"
#include "dialogs/dialogs_key.h"
@ -199,8 +200,8 @@ private:
object_ptr<BottomButton> _loadMoreChats = { nullptr };
std::unique_ptr<Window::ConnectionState> _connecting;
Animation _scrollToAnimation;
Animation _a_show;
Ui::Animations::Simple _scrollToAnimation;
Ui::Animations::Simple _a_show;
Window::SlideDirection _showDirection;
QPixmap _cacheUnder, _cacheOver;

15
Telegram/SourceFiles/export/view/export_view_progress.cpp
View File

@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#include "export/view/export_view_progress.h"
#include "ui/effects/animations.h"
#include "ui/widgets/labels.h"
#include "ui/widgets/buttons.h"
#include "ui/wrap/fade_wrap.h"
@ -35,10 +36,10 @@ private:
base::unique_qptr<Ui::FadeWrap<Ui::FlatLabel>> info;
float64 value = 0.;
Animation progress;
Ui::Animations::Simple progress;
bool hiding = true;
Animation opacity;
Ui::Animations::Simple opacity;
};
void fillCurrentInstance();
@ -77,7 +78,7 @@ void ProgressWidget::Row::updateData(Content::Row &&data) {
_current.info->entity()->setText(_data.info);
setInstanceProgress(_current, _data.progress);
if (nowId != wasId) {
_current.progress.finish();
_current.progress.stop();
}
}
updateControlsGeometry(width());
@ -105,7 +106,7 @@ void ProgressWidget::Row::fillCurrentInstance() {
setInstanceProgress(_current, _data.progress);
toggleInstance(_current, true);
if (_data.id == "main") {
_current.opacity.finish();
_current.opacity.stop();
_current.label->finishAnimating();
_current.info->finishAnimating();
}
@ -131,7 +132,7 @@ void ProgressWidget::Row::setInstanceProgress(
st::exportProgressDuration,
anim::sineInOut);
} else if (_current.value > progress) {
_current.progress.finish();
_current.progress.stop();
}
_current.value = progress;
}
@ -194,7 +195,7 @@ void ProgressWidget::Row::paintEvent(QPaintEvent *e) {
}
void ProgressWidget::Row::paintInstance(Painter &p, const Instance &data) {
const auto opacity = data.opacity.current(data.hiding ? 0. : 1.);
const auto opacity = data.opacity.value(data.hiding ? 0. : 1.);
if (!opacity) {
return;
@ -203,7 +204,7 @@ void ProgressWidget::Row::paintInstance(Painter &p, const Instance &data) {
const auto thickness = st::exportProgressWidth;
const auto top = height() - thickness;
const auto till = qRound(data.progress.current(data.value) * width());
const auto till = qRound(data.progress.value(data.value) * width());
if (till > 0) {
p.fillRect(0, top, till, thickness, st::exportProgressFg);
}

5
Telegram/SourceFiles/history/admin_log/history_admin_log_filter.cpp
View File

@ -99,10 +99,9 @@ void UserCheckbox::setChecked(bool checked, NotifyAboutChange notify) {
void UserCheckbox::paintEvent(QPaintEvent *e) {
Painter p(this);
auto ms = crl::now();
auto active = _check->currentAnimationValue(ms);
auto active = _check->currentAnimationValue();
auto color = anim::color(_st.rippleBg, _st.rippleBgActive, active);
paintRipple(p, _st.rippleAreaPosition.x(), _st.rippleAreaPosition.y() + (_checkRect.y() - st::defaultBoxCheckbox.margin.top()), ms, &color);
paintRipple(p, _st.rippleAreaPosition.x(), _st.rippleAreaPosition.y() + (_checkRect.y() - st::defaultBoxCheckbox.margin.top()), &color);
auto realCheckRect = myrtlrect(_checkRect);
if (realCheckRect.intersects(e->rect())) {

2
Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
View File

@ -801,7 +801,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
});
auto dateHeight = st::msgServicePadding.bottom() + st::msgServiceFont->height + st::msgServicePadding.top();
auto scrollDateOpacity = _scrollDateOpacity.current(ms, _scrollDateShown ? 1. : 0.);
auto scrollDateOpacity = _scrollDateOpacity.value(_scrollDateShown ? 1. : 0.);
enumerateDates([&](not_null<Element*> view, int itemtop, int dateTop) {
// stop the enumeration if the date is above the painted rect
if (dateTop + dateHeight <= clip.top()) {

5
Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
View File

@ -10,8 +10,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/view/history_view_element.h"
#include "history/admin_log/history_admin_log_item.h"
#include "history/admin_log/history_admin_log_section.h"
#include "ui/widgets/tooltip.h"
#include "ui/rp_widget.h"
#include "ui/effects/animations.h"
#include "ui/widgets/tooltip.h"
#include "mtproto/sender.h"
#include "base/timer.h"
@ -219,7 +220,7 @@ private:
int _visibleTopFromItem = 0;
bool _scrollDateShown = false;
Animation _scrollDateOpacity;
Ui::Animations::Simple _scrollDateOpacity;
SingleQueuedInvokation _scrollDateCheck;
base::Timer _scrollDateHideTimer;
Element *_scrollDateLastItem = nullptr;

5
Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp
View File

@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/admin_log/history_admin_log_filter.h"
#include "profile/profile_back_button.h"
#include "core/shortcuts.h"
#include "ui/effects/animations.h"
#include "ui/widgets/scroll_area.h"
#include "ui/widgets/shadow.h"
#include "ui/widgets/buttons.h"
@ -77,7 +78,7 @@ private:
object_ptr<Ui::CrossButton> _cancel;
object_ptr<Ui::RoundButton> _filter;
Animation _searchShownAnimation;
Ui::Animations::Simple _searchShownAnimation;
bool _searchShown = false;
bool _animatingMode = false;
base::Timer _searchTimer;
@ -194,7 +195,7 @@ int FixedBar::resizeGetHeight(int newWidth) {
auto searchShownLeft = st::topBarArrowPadding.left();
auto searchHiddenLeft = filterLeft - _search->width();
auto searchShown = _searchShownAnimation.current(_searchShown ? 1. : 0.);
auto searchShown = _searchShownAnimation.value(_searchShown ? 1. : 0.);
auto searchCurrentLeft = anim::interpolate(searchHiddenLeft, searchShownLeft, searchShown);
_search->moveToLeft(searchCurrentLeft, 0);
_backButton->resizeToWidth(searchCurrentLeft);

7
Telegram/SourceFiles/history/feed/history_feed_section.cpp
View File

@ -230,7 +230,7 @@ void Widget::updateScrollDownPosition() {
auto top = anim::interpolate(
0,
_scrollDown->height() + st::historyToDownPosition.y(),
_scrollDownShown.current(_scrollDownIsShown ? 1. : 0.));
_scrollDownShown.value(_scrollDownIsShown ? 1. : 0.));
_scrollDown->moveToRight(
st::historyToDownPosition.x(),
_scroll->height() - top);
@ -241,7 +241,7 @@ void Widget::updateScrollDownPosition() {
}
void Widget::scrollDownAnimationFinish() {
_scrollDownShown.finish();
_scrollDownShown.stop();
updateScrollDownPosition();
}
@ -536,9 +536,6 @@ void Widget::paintEvent(QPaintEvent *e) {
// updateListSize();
//}
const auto ms = crl::now();
_scrollDownShown.step(ms);
SectionWidget::PaintBackground(this, e->rect());
if (_emptyTextView) {

3
Telegram/SourceFiles/history/feed/history_feed_section.h
View File

@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
#include "ui/effects/animations.h"
#include "history/view/history_view_list_widget.h"
#include "window/section_widget.h"
#include "window/section_memento.h"
@ -138,7 +139,7 @@ private:
std::optional<Data::MessagePosition> _nextAnimatedScrollPosition;
int _nextAnimatedScrollDelta = 0;
Animation _scrollDownShown;
Ui::Animations::Simple _scrollDownShown;
bool _scrollDownIsShown = false;
object_ptr<Ui::HistoryDownButton> _scrollDown;
std::shared_ptr<Window::DateClickHandler> _dateLink;

9
Telegram/SourceFiles/history/history_drag_area.cpp
View File

@ -69,8 +69,7 @@ void DragArea::setText(const QString &text, const QString &subtext) {
void DragArea::paintEvent(QPaintEvent *e) {
Painter p(this);
auto ms = crl::now();
auto opacity = _a_opacity.current(ms, _hiding ? 0. : 1.);
auto opacity = _a_opacity.value(_hiding ? 0. : 1.);
if (!_a_opacity.animating() && _hiding) {
return;
}
@ -85,7 +84,7 @@ void DragArea::paintEvent(QPaintEvent *e) {
Ui::Shadow::paint(p, inner, width(), st::boxRoundShadow);
App::roundRect(p, inner, st::boxBg, BoxCorners);
p.setPen(anim::pen(st::dragColor, st::dragDropColor, _a_in.current(ms, _in ? 1. : 0.)));
p.setPen(anim::pen(st::dragColor, st::dragDropColor, _a_in.value(_in ? 1. : 0.)));
p.setFont(st::dragFont);
p.drawText(QRect(0, (height() - st::dragHeight) / 2, width(), st::dragFont->height), _text, QTextOption(style::al_top));
@ -121,7 +120,7 @@ void DragArea::otherLeave() {
}
void DragArea::hideFast() {
_a_opacity.finish();
_a_opacity.stop();
hide();
}
@ -142,7 +141,7 @@ void DragArea::hideStart() {
void DragArea::hideFinish() {
hide();
_in = false;
_a_in.finish();
_a_in.stop();
}
void DragArea::showStart() {

5
Telegram/SourceFiles/history/history_drag_area.h
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#pragma once
#include "ui/twidget.h"
#include "ui/effects/animations.h"
class DragArea : public TWidget {
Q_OBJECT
@ -59,8 +60,8 @@ private:
QPixmap _cache;
Fn<void(const QMimeData *data)> _droppedCallback;
Animation _a_opacity;
Animation _a_in;
Ui::Animations::Simple _a_opacity;
Ui::Animations::Simple _a_in;
QString _text, _subtext;

4
Telegram/SourceFiles/history/history_inner_widget.cpp
View File

@ -718,7 +718,7 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
//int showFloatingBefore = height() - 2 * (_visibleAreaBottom - _visibleAreaTop) - dateHeight;
auto scrollDateOpacity = _scrollDateOpacity.current(ms, _scrollDateShown ? 1. : 0.);
auto scrollDateOpacity = _scrollDateOpacity.value(_scrollDateShown ? 1. : 0.);
enumerateDates([&](not_null<Element*> view, int itemtop, int dateTop) {
// stop the enumeration if the date is above the painted rect
if (dateTop + dateHeight <= clip.top()) {
@ -2471,7 +2471,7 @@ void HistoryInner::mouseActionUpdate() {
}
auto dateHeight = st::msgServicePadding.bottom() + st::msgServiceFont->height + st::msgServicePadding.top();
auto scrollDateOpacity = _scrollDateOpacity.current(_scrollDateShown ? 1. : 0.);
auto scrollDateOpacity = _scrollDateOpacity.value(_scrollDateShown ? 1. : 0.);
enumerateDates([&](not_null<Element*> view, int itemtop, int dateTop) {
// stop enumeration if the date is above our point
if (dateTop + dateHeight <= point.y()) {

3
Telegram/SourceFiles/history/history_inner_widget.h
View File

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/timer.h"
#include "ui/rp_widget.h"
#include "ui/effects/animations.h"
#include "ui/widgets/tooltip.h"
#include "ui/widgets/scroll_area.h"
#include "history/view/history_view_top_bar_widget.h"
@ -362,7 +363,7 @@ private:
int _visibleAreaBottom = 0;
bool _scrollDateShown = false;
Animation _scrollDateOpacity;
Ui::Animations::Simple _scrollDateOpacity;
SingleQueuedInvokation _scrollDateCheck;
base::Timer _scrollDateHideTimer;
Element *_scrollDateLastItem = nullptr;

15
Telegram/SourceFiles/history/history_item_components.cpp
View File

@ -541,21 +541,21 @@ int ReplyKeyboard::naturalHeight() const {
return (_rows.size() - 1) * _st->buttonSkip() + _rows.size() * _st->buttonHeight();
}
void ReplyKeyboard::paint(Painter &p, int outerWidth, const QRect &clip, crl::time ms) const {
void ReplyKeyboard::paint(Painter &p, int outerWidth, const QRect &clip) const {
Assert(_st != nullptr);
Assert(_width > 0);
_st->startPaint(p);
for_const (auto &row, _rows) {
for_const (auto &button, row) {
QRect rect(button.rect);
for (const auto &row : _rows) {
for (const auto &button : row) {
const auto rect = button.rect;
if (rect.y() >= clip.y() + clip.height()) return;
if (rect.y() + rect.height() < clip.y()) continue;
// just ignore the buttons that didn't layout well
if (rect.x() + rect.width() > _width) break;
_st->paintButton(p, outerWidth, button, ms);
_st->paintButton(p, outerWidth, button);
}
}
}
@ -694,12 +694,11 @@ int ReplyKeyboard::Style::buttonHeight() const {
void ReplyKeyboard::Style::paintButton(
Painter &p,
int outerWidth,
const ReplyKeyboard::Button &button,
crl::time ms) const {
const ReplyKeyboard::Button &button) const {
const QRect &rect = button.rect;
paintButtonBg(p, rect, button.howMuchOver);
if (button.ripple) {
button.ripple->paint(p, rect.x(), rect.y(), outerWidth, ms);
button.ripple->paint(p, rect.x(), rect.y(), outerWidth);
if (button.ripple->empty()) {
button.ripple.reset();
}

4
Telegram/SourceFiles/history/history_item_components.h
View File

@ -278,7 +278,7 @@ public:
private:
const style::BotKeyboardButton *_st;
void paintButton(Painter &p, int outerWidth, const ReplyKeyboard::Button &button, crl::time ms) const;
void paintButton(Painter &p, int outerWidth, const ReplyKeyboard::Button &button) const;
friend class ReplyKeyboard;
};
@ -297,7 +297,7 @@ public:
int naturalWidth() const;
int naturalHeight() const;
void paint(Painter &p, int outerWidth, const QRect &clip, crl::time ms) const;
void paint(Painter &p, int outerWidth, const QRect &clip) const;
ClickHandlerPtr getLink(QPoint point) const;
void clickHandlerActiveChanged(const ClickHandlerPtr &p, bool active);

69
Telegram/SourceFiles/history/history_widget.cpp
View File

@ -675,7 +675,7 @@ void HistoryWidget::animatedScrollToY(int scrollTo, HistoryItem *attachTo) {
return;
}
_scrollToAnimation.finish();
_scrollToAnimation.stop();
auto maxAnimatedDelta = _scroll->height();
auto transition = anim::sineInOut;
if (scrollTo > scrollTop + maxAnimatedDelta) {
@ -692,15 +692,25 @@ void HistoryWidget::animatedScrollToY(int scrollTo, HistoryItem *attachTo) {
// jump to the bottom of history in some updateHistoryGeometry() call.
synteticScrollToY(scrollTop);
}
_scrollToAnimation.start([this, itemId = attachTo->fullId()] { scrollToAnimationCallback(itemId); }, scrollTop - itemTop, scrollTo - itemTop, st::slideDuration, anim::sineInOut);
const auto itemId = attachTo->fullId();
const auto relativeFrom = scrollTop - itemTop;
const auto relativeTo = scrollTo - itemTop;
_scrollToAnimation.start(
[=] { scrollToAnimationCallback(itemId, relativeTo); },
relativeFrom,
relativeTo,
st::slideDuration,
anim::sineInOut);
}
void HistoryWidget::scrollToAnimationCallback(FullMsgId attachToId) {
void HistoryWidget::scrollToAnimationCallback(
FullMsgId attachToId,
int relativeTo) {
auto itemTop = _list->itemTop(App::histItemById(attachToId));
if (itemTop < 0) {
_scrollToAnimation.finish();
_scrollToAnimation.stop();
} else {
synteticScrollToY(qRound(_scrollToAnimation.current()) + itemTop);
synteticScrollToY(qRound(_scrollToAnimation.value(relativeTo)) + itemTop);
}
if (!_scrollToAnimation.animating()) {
preloadHistoryByScroll();
@ -1346,7 +1356,7 @@ void HistoryWidget::setupShortcuts() {
void HistoryWidget::clearReplyReturns() {
_replyReturns.clear();
_replyReturn = 0;
_replyReturn = nullptr;
}
void HistoryWidget::pushReplyReturn(not_null<HistoryItem*> item) {
@ -1575,7 +1585,7 @@ void HistoryWidget::showHistory(
destroyUnreadBar();
destroyPinnedBar();
_membersDropdown.destroy();
_scrollToAnimation.finish();
_scrollToAnimation.stop();
_history = _migrated = nullptr;
_list = nullptr;
_peer = nullptr;
@ -2924,7 +2934,7 @@ void HistoryWidget::showAnimated(
const Window::SectionSlideParams &params) {
_showDirection = direction;
_a_show.finish();
_a_show.stop();
_cacheUnder = params.oldContentCache;
show();
@ -2940,7 +2950,7 @@ void HistoryWidget::showAnimated(
if (_showDirection == Window::SlideDirection::FromLeft) {
std::swap(_cacheUnder, _cacheOver);
}
_a_show.start([this] { animationCallback(); }, 0., 1., st::slideDuration, Window::SlideAnimation::transition());
_a_show.start([=] { animationCallback(); }, 0., 1., st::slideDuration, Window::SlideAnimation::transition());
if (_history) {
_topBar->show();
_topBar->setAnimatingMode(true);
@ -2978,7 +2988,7 @@ void HistoryWidget::doneShow() {
void HistoryWidget::finishAnimating() {
if (!_a_show.animating()) return;
_a_show.finish();
_a_show.stop();
_topShadow->setVisible(_peer != nullptr);
_topBar->setVisible(_peer != nullptr);
historyDownAnimationFinish();
@ -2986,12 +2996,12 @@ void HistoryWidget::finishAnimating() {
}
void HistoryWidget::historyDownAnimationFinish() {
_historyDownShown.finish();
_historyDownShown.stop();
updateHistoryDownPosition();
}
void HistoryWidget::unreadMentionsAnimationFinish() {
_unreadMentionsShown.finish();
_unreadMentionsShown.stop();
updateUnreadMentionsPosition();
}
@ -4655,7 +4665,7 @@ void HistoryWidget::itemRemoved(not_null<const HistoryItem*> item) {
}
if (_kbReplyTo && item == _kbReplyTo) {
onKbToggle();
_kbReplyTo = 0;
_kbReplyTo = nullptr;
}
auto found = ranges::find(_toForward, item);
if (found != _toForward.end()) {
@ -4837,7 +4847,7 @@ void HistoryWidget::updateHistoryGeometry(bool initial, bool loadedDown, const S
if (initial) {
_historyInited = true;
_scrollToAnimation.finish();
_scrollToAnimation.stop();
}
auto newScrollTop = initial
? countInitialScrollTop()
@ -4938,7 +4948,9 @@ void HistoryWidget::updateBotKeyboard(History *h, bool force) {
} else if (_replyToId && _replyEditMsg) {
changed = _keyboard->updateMarkup(_replyEditMsg, force);
} else {
HistoryItem *keyboardItem = _history->lastKeyboardId ? App::histItemById(_channel, _history->lastKeyboardId) : nullptr;
const auto keyboardItem = _history->lastKeyboardId
? App::histItemById(_channel, _history->lastKeyboardId)
: nullptr;
changed = _keyboard->updateMarkup(keyboardItem, force);
}
updateCmdStartShown();
@ -4966,7 +4978,9 @@ void HistoryWidget::updateBotKeyboard(History *h, bool force) {
int32 maxh = hasMarkup ? qMin(_keyboard->height(), st::historyComposeFieldMaxHeight - (st::historyComposeFieldMaxHeight / 2)) : 0;
_field->setMaxHeight(st::historyComposeFieldMaxHeight - maxh);
_kbShown = hasMarkup;
_kbReplyTo = (_peer->isChat() || _peer->isChannel() || _keyboard->forceReply()) ? App::histItemById(_keyboard->forMsgId()) : 0;
_kbReplyTo = (_peer->isChat() || _peer->isChannel() || _keyboard->forceReply())
? App::histItemById(_keyboard->forMsgId())
: nullptr;
if (_kbReplyTo && !_replyToId) {
updateReplyToName();
updateReplyEditText(_kbReplyTo);
@ -4981,7 +4995,7 @@ void HistoryWidget::updateBotKeyboard(History *h, bool force) {
}
_field->setMaxHeight(st::historyComposeFieldMaxHeight);
_kbShown = false;
_kbReplyTo = 0;
_kbReplyTo = nullptr;
if (!readyToForward() && (!_previewData || _previewData->pendingTill < 0) && !_replyToId) {
_fieldBarCancel->hide();
updateMouseTracking();
@ -4997,7 +5011,7 @@ void HistoryWidget::updateBotKeyboard(History *h, bool force) {
}
_field->setMaxHeight(st::historyComposeFieldMaxHeight);
_kbShown = false;
_kbReplyTo = 0;
_kbReplyTo = nullptr;
if (!readyToForward() && (!_previewData || _previewData->pendingTill < 0) && !_replyToId && !_editMsgId) {
_fieldBarCancel->hide();
updateMouseTracking();
@ -5009,7 +5023,7 @@ void HistoryWidget::updateBotKeyboard(History *h, bool force) {
void HistoryWidget::updateHistoryDownPosition() {
// _historyDown is a child widget of _scroll, not me.
auto top = anim::interpolate(0, _historyDown->height() + st::historyToDownPosition.y(), _historyDownShown.current(_historyDownIsShown ? 1. : 0.));
auto top = anim::interpolate(0, _historyDown->height() + st::historyToDownPosition.y(), _historyDownShown.value(_historyDownIsShown ? 1. : 0.));
_historyDown->moveToRight(st::historyToDownPosition.x(), _scroll->height() - top);
auto shouldBeHidden = !_historyDownIsShown && !_historyDownShown.animating();
if (shouldBeHidden != _historyDown->isHidden()) {
@ -5052,14 +5066,14 @@ void HistoryWidget::updateHistoryDownVisibility() {
auto historyDownIsShown = historyDownIsVisible();
if (_historyDownIsShown != historyDownIsShown) {
_historyDownIsShown = historyDownIsShown;
_historyDownShown.start([this] { updateHistoryDownPosition(); }, _historyDownIsShown ? 0. : 1., _historyDownIsShown ? 1. : 0., st::historyToDownDuration);
_historyDownShown.start([=] { updateHistoryDownPosition(); }, _historyDownIsShown ? 0. : 1., _historyDownIsShown ? 1. : 0., st::historyToDownDuration);
}
}
void HistoryWidget::updateUnreadMentionsPosition() {
// _unreadMentions is a child widget of _scroll, not me.
auto right = anim::interpolate(-_unreadMentions->width(), st::historyToDownPosition.x(), _unreadMentionsShown.current(_unreadMentionsIsShown ? 1. : 0.));
auto shift = anim::interpolate(0, _historyDown->height() + st::historyUnreadMentionsSkip, _historyDownShown.current(_historyDownIsShown ? 1. : 0.));
auto right = anim::interpolate(-_unreadMentions->width(), st::historyToDownPosition.x(), _unreadMentionsShown.value(_unreadMentionsIsShown ? 1. : 0.));
auto shift = anim::interpolate(0, _historyDown->height() + st::historyUnreadMentionsSkip, _historyDownShown.value(_historyDownIsShown ? 1. : 0.));
auto top = _scroll->height() - _unreadMentions->height() - st::historyToDownPosition.y() - shift;
_unreadMentions->moveToRight(right, top);
auto shouldBeHidden = !_unreadMentionsIsShown && !_unreadMentionsShown.animating();
@ -5087,7 +5101,7 @@ void HistoryWidget::updateUnreadMentionsVisibility() {
}
if (_unreadMentionsIsShown != unreadMentionsIsShown) {
_unreadMentionsIsShown = unreadMentionsIsShown;
_unreadMentionsShown.start([this] { updateUnreadMentionsPosition(); }, _unreadMentionsIsShown ? 0. : 1., _unreadMentionsIsShown ? 1. : 0., st::historyToDownDuration);
_unreadMentionsShown.start([=] { updateUnreadMentionsPosition(); }, _unreadMentionsIsShown ? 0. : 1., _unreadMentionsIsShown ? 1. : 0., st::historyToDownDuration);
}
}
@ -6534,8 +6548,8 @@ void HistoryWidget::drawPinnedBar(Painter &p) {
}
}
bool HistoryWidget::paintShowAnimationFrame(crl::time ms) {
auto progress = _a_show.current(ms, 1.);
bool HistoryWidget::paintShowAnimationFrame() {
auto progress = _a_show.value(1.);
if (!_a_show.animating()) {
return false;
}
@ -6560,10 +6574,7 @@ bool HistoryWidget::paintShowAnimationFrame(crl::time ms) {
}
void HistoryWidget::paintEvent(QPaintEvent *e) {
auto ms = crl::now();
_historyDownShown.step(ms);
_unreadMentionsShown.step(ms);
if (paintShowAnimationFrame(ms)) {
if (paintShowAnimationFrame()) {
return;
}
if (Ui::skipPaintEvent(this, e)) {

12
Telegram/SourceFiles/history/history_widget.h
View File

@ -550,7 +550,7 @@ private:
void drawRecording(Painter &p, float64 recordActive);
void drawPinnedBar(Painter &p);
void drawRestrictedWrite(Painter &p, const QString &error);
bool paintShowAnimationFrame(crl::time ms);
bool paintShowAnimationFrame();
void updateMouseTracking();
@ -670,7 +670,7 @@ private:
int countAutomaticScrollTop();
void preloadHistoryByScroll();
void checkReplyReturns();
void scrollToAnimationCallback(FullMsgId attachToId);
void scrollToAnimationCallback(FullMsgId attachToId, int relativeTo);
bool readyToForward() const;
bool hasSilentToggle() const;
@ -707,13 +707,13 @@ private:
crl::time _lastUserScrolled = 0;
bool _synteticScrollEvent = false;
Animation _scrollToAnimation;
Ui::Animations::Simple _scrollToAnimation;
Animation _historyDownShown;
Ui::Animations::Simple _historyDownShown;
bool _historyDownIsShown = false;
object_ptr<Ui::HistoryDownButton> _historyDown;
Animation _unreadMentionsShown;
Ui::Animations::Simple _unreadMentionsShown;
bool _unreadMentionsIsShown = false;
object_ptr<Ui::HistoryDownButton> _unreadMentions;
@ -797,7 +797,7 @@ private:
QString _confirmSource;
Animation _a_show;
Ui::Animations::Simple _a_show;
Window::SlideDirection _showDirection;
QPixmap _cacheUnder, _cacheOver;

7
Telegram/SourceFiles/history/media/history_media_file.h
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#pragma once
#include "history/media/history_media.h"
#include "ui/effects/animations.h"
#include "ui/effects/radial_animation.h"
class HistoryFileMedia : public HistoryMedia {
@ -73,9 +74,9 @@ protected:
&& _animation->radial.animating()
&& radialAnimationCallback(now);
}
bool isThumbAnimation(crl::time ms) const {
bool isThumbAnimation() const {
if (_animation) {
if (_animation->a_thumbOver.animating(ms)) {
if (_animation->a_thumbOver.animating()) {
return true;
}
checkAnimationFinished();
@ -93,7 +94,7 @@ protected:
: radial(std::forward<Callback>(radialCallback)) {
}
Animation a_thumbOver;
Ui::Animations::Simple a_thumbOver;
Ui::RadialAnimation radial;
};
mutable std::unique_ptr<AnimationData> _animation;

4
Telegram/SourceFiles/history/media/history_media_gif.cpp
View File

@ -376,8 +376,8 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, crl::
p.setPen(Qt::NoPen);
if (selected) {
p.setBrush(st::msgDateImgBgSelected);
} else if (isThumbAnimation(ms)) {
auto over = _animation->a_thumbOver.current();
} else if (isThumbAnimation()) {
auto over = _animation->a_thumbOver.value(1.);
p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, over));
} else {
auto over = ClickHandler::showAsActive(_data->loading() ? _cancell : _savel);

8
Telegram/SourceFiles/history/media/history_media_photo.cpp
View File

@ -224,8 +224,8 @@ void HistoryPhoto::draw(Painter &p, const QRect &r, TextSelection selection, crl
p.setPen(Qt::NoPen);
if (selected) {
p.setBrush(st::msgDateImgBgSelected);
} else if (isThumbAnimation(ms)) {
auto over = _animation->a_thumbOver.current();
} else if (isThumbAnimation()) {
auto over = _animation->a_thumbOver.value(1.);
p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, over));
} else {
auto over = ClickHandler::showAsActive(_data->loading() ? _cancell : _savel);
@ -395,8 +395,8 @@ void HistoryPhoto::drawGrouped(
p.setPen(Qt::NoPen);
if (selected) {
p.setBrush(st::msgDateImgBgSelected);
} else if (isThumbAnimation(ms)) {
auto over = _animation->a_thumbOver.current();
} else if (isThumbAnimation()) {
auto over = _animation->a_thumbOver.value(1.);
p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, over));
} else {
auto over = ClickHandler::showAsActive(_data->loading() ? _cancell : _savel);

13
Telegram/SourceFiles/history/media/history_media_poll.cpp
View File

@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/view/history_view_cursor_state.h"
#include "calls/calls_instance.h"
#include "ui/text_options.h"
#include "ui/effects/animations.h"
#include "ui/effects/radial_animation.h"
#include "ui/effects/ripple_animation.h"
#include "data/data_media_types.h"
@ -138,7 +139,7 @@ struct HistoryPoll::AnswerAnimation {
struct HistoryPoll::AnswersAnimation {
std::vector<AnswerAnimation> data;
Animation progress;
Ui::Animations::Simple progress;
};
struct HistoryPoll::SendingAnimation {
@ -512,7 +513,7 @@ void HistoryPoll::draw(Painter &p, const QRect &r, TextSelection selection, crl:
tshift += st::msgDateFont->height + st::historyPollAnswersSkip;
const auto progress = _answersAnimation
? _answersAnimation->progress.current(ms, 1.)
? _answersAnimation->progress.value(1.)
: 1.;
if (progress == 1.) {
resetAnswersAnimation();
@ -538,8 +539,7 @@ void HistoryPoll::draw(Painter &p, const QRect &r, TextSelection selection, crl:
tshift,
paintw,
width(),
selection,
ms);
selection);
tshift += height;
}
if (!_totalVotesLabel.isEmpty()) {
@ -577,8 +577,7 @@ int HistoryPoll::paintAnswer(
int top,
int width,
int outerWidth,
TextSelection selection,
crl::time ms) const {
TextSelection selection) const {
const auto height = countAnswerHeight(answer, width);
const auto outbg = _parent->hasOutLayout();
const auto aleft = left + st::historyPollAnswerPadding.left();
@ -588,7 +587,7 @@ int HistoryPoll::paintAnswer(
if (answer.ripple) {
p.setOpacity(st::historyPollRippleOpacity);
answer.ripple->paint(p, left - st::msgPadding.left(), top, outerWidth, ms);
answer.ripple->paint(p, left - st::msgPadding.left(), top, outerWidth);
if (answer.ripple->empty()) {
answer.ripple.reset();
}

3
Telegram/SourceFiles/history/media/history_media_poll.h
View File

@ -79,8 +79,7 @@ private:
int top,
int width,
int outerWidth,
TextSelection selection,
crl::time ms) const;
TextSelection selection) const;
void paintRadio(
Painter &p,
const Answer &answer,

8
Telegram/SourceFiles/history/media/history_media_video.cpp
View File

@ -222,8 +222,8 @@ void HistoryVideo::draw(Painter &p, const QRect &r, TextSelection selection, crl
p.setPen(Qt::NoPen);
if (selected) {
p.setBrush(st::msgDateImgBgSelected);
} else if (isThumbAnimation(ms)) {
auto over = _animation->a_thumbOver.current();
} else if (isThumbAnimation()) {
auto over = _animation->a_thumbOver.value(1.);
p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, over));
} else {
bool over = ClickHandler::showAsActive((_data->loading() || _data->uploading()) ? _cancell : _savel);
@ -431,8 +431,8 @@ void HistoryVideo::drawGrouped(
p.setPen(Qt::NoPen);
if (selected) {
p.setBrush(st::msgDateImgBgSelected);
} else if (isThumbAnimation(ms)) {
auto over = _animation->a_thumbOver.current();
} else if (isThumbAnimation()) {
auto over = _animation->a_thumbOver.value(1.);
p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, over));
} else {
auto over = ClickHandler::showAsActive(_data->loading() ? _cancell : _savel);

4
Telegram/SourceFiles/history/media/history_media_wall_paper.cpp
View File

@ -137,8 +137,8 @@ void HistoryWallPaper::draw(Painter &p, const QRect &r, TextSelection selection,
p.setPen(Qt::NoPen);
if (selected) {
p.setBrush(st::msgDateImgBgSelected);
} else if (isThumbAnimation(ms)) {
auto over = _animation->a_thumbOver.current();
} else if (isThumbAnimation()) {
auto over = _animation->a_thumbOver.value(1.);
p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, over));
} else {
auto over = ClickHandler::showAsActive(_data->loading() ? _cancell : _openl);

19
Telegram/SourceFiles/history/view/history_view_list_widget.cpp
View File

@ -369,7 +369,7 @@ void ListWidget::animatedScrollTo(
Data::MessagePosition attachPosition,
int delta,
AnimatedScroll type) {
_scrollToAnimation.finish();
_scrollToAnimation.stop();
if (!delta || _items.empty()) {
_delegate->listScrollTo(scrollTop);
return;
@ -388,20 +388,23 @@ void ListWidget::animatedScrollTo(
const auto relativeStart = initial - attachToTop;
const auto relativeFinish = scrollTop - attachToTop;
_scrollToAnimation.start(
[=] { scrollToAnimationCallback(attachToId); },
[=] { scrollToAnimationCallback(attachToId, relativeFinish); },
relativeStart,
relativeFinish,
st::slideDuration,
transition);
}
void ListWidget::scrollToAnimationCallback(FullMsgId attachToId) {
void ListWidget::scrollToAnimationCallback(
FullMsgId attachToId,
int relativeTo) {
const auto attachTo = App::histItemById(attachToId);
const auto attachToView = viewForItem(attachTo);
if (!attachToView) {
_scrollToAnimation.finish();
_scrollToAnimation.stop();
} else {
const auto current = int(std::round(_scrollToAnimation.current()));
const auto current = int(std::round(_scrollToAnimation.value(
relativeTo)));
_delegate->listScrollTo(itemTop(attachToView) + current);
}
}
@ -1326,7 +1329,7 @@ void ListWidget::paintEvent(QPaintEvent *e) {
});
auto dateHeight = st::msgServicePadding.bottom() + st::msgServiceFont->height + st::msgServicePadding.top();
auto scrollDateOpacity = _scrollDateOpacity.current(ms, _scrollDateShown ? 1. : 0.);
auto scrollDateOpacity = _scrollDateOpacity.value(_scrollDateShown ? 1. : 0.);
enumerateDates([&](not_null<Element*> view, int itemtop, int dateTop) {
// stop the enumeration if the date is above the painted rect
if (dateTop + dateHeight <= clip.top()) {
@ -1426,7 +1429,7 @@ TextWithEntities ListWidget::getSelectedText() const {
part.text.reserve(size);
part.text.append(item->author()->name).append(time);
TextUtilities::Append(part, std::move(unwrapped));
texts.push_back(std::make_pair(std::move(item), std::move(part)));
texts.emplace_back(std::move(item), std::move(part));
fullSize += size;
};
const auto addItem = [&](not_null<HistoryItem*> item) {
@ -2092,7 +2095,7 @@ void ListWidget::mouseActionUpdate() {
const auto dateHeight = st::msgServicePadding.bottom()
+ st::msgServiceFont->height
+ st::msgServicePadding.top();
const auto scrollDateOpacity = _scrollDateOpacity.current(_scrollDateShown ? 1. : 0.);
const auto scrollDateOpacity = _scrollDateOpacity.value(_scrollDateShown ? 1. : 0.);
enumerateDates([&](not_null<Element*> view, int itemtop, int dateTop) {
// stop enumeration if the date is above our point
if (dateTop + dateHeight <= point.y()) {

9
Telegram/SourceFiles/history/view/history_view_list_widget.h
View File

@ -7,8 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
#include "ui/widgets/tooltip.h"
#include "ui/rp_widget.h"
#include "ui/effects/animations.h"
#include "ui/widgets/tooltip.h"
#include "mtproto/sender.h"
#include "base/timer.h"
#include "data/data_messages.h"
@ -381,7 +382,7 @@ private:
not_null<const Element*> view) const;
void checkUnreadBarCreation();
void applyUpdatedScrollState();
void scrollToAnimationCallback(FullMsgId attachToId);
void scrollToAnimationCallback(FullMsgId attachToId, int relativeTo);
void updateHighlightedMessage();
@ -437,10 +438,10 @@ private:
Element *_visibleTopItem = nullptr;
int _visibleTopFromItem = 0;
ScrollTopState _scrollTopState;
Animation _scrollToAnimation;
Ui::Animations::Simple _scrollToAnimation;
bool _scrollDateShown = false;
Animation _scrollDateOpacity;
Ui::Animations::Simple _scrollDateOpacity;
SingleQueuedInvokation _scrollDateCheck;
base::Timer _scrollDateHideTimer;
Element *_scrollDateLastItem = nullptr;

2
Telegram/SourceFiles/history/view/history_view_message.cpp
View File

@ -421,7 +421,7 @@ void Message::draw(
g.setHeight(g.height() - keyboardHeight);
auto keyboardPosition = QPoint(g.left(), g.top() + g.height() + st::msgBotKbButton.margin);
p.translate(keyboardPosition);
keyboard->paint(p, g.width(), clip.translated(-keyboardPosition), ms);
keyboard->paint(p, g.width(), clip.translated(-keyboardPosition));
p.translate(-keyboardPosition);
}

20
Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
View File

@ -286,20 +286,17 @@ void TopBarWidget::paintEvent(QPaintEvent *e) {
}
Painter p(this);
auto ms = crl::now();
_forward->stepNumbersAnimation(ms);
_delete->stepNumbersAnimation(ms);
auto hasSelected = (_selectedCount > 0);
auto selectedButtonsTop = countSelectedButtonsTop(_selectedShown.current(crl::now(), hasSelected ? 1. : 0.));
auto selectedButtonsTop = countSelectedButtonsTop(_selectedShown.value(hasSelected ? 1. : 0.));
p.fillRect(QRect(0, 0, width(), st::topBarHeight), st::topBarBg);
if (selectedButtonsTop < 0) {
p.translate(0, selectedButtonsTop + st::topBarHeight);
paintTopBar(p, ms);
paintTopBar(p);
}
}
void TopBarWidget::paintTopBar(Painter &p, crl::time ms) {
void TopBarWidget::paintTopBar(Painter &p) {
if (!_activeChat) {
return;
}
@ -339,7 +336,7 @@ void TopBarWidget::paintTopBar(Painter &p, crl::time ms) {
history->peer->dialogName().drawElided(p, nameleft, nametop, namewidth);
p.setFont(st::dialogsTextFont);
if (paintConnectingState(p, nameleft, statustop, width(), ms)) {
if (paintConnectingState(p, nameleft, statustop, width())) {
return;
} else if (history->paintSendAction(
p,
@ -348,7 +345,7 @@ void TopBarWidget::paintTopBar(Painter &p, crl::time ms) {
namewidth,
width(),
st::historyStatusFgTyping,
ms)) {
crl::now())) {
return;
} else {
paintStatus(p, nameleft, statustop, namewidth, width());
@ -360,8 +357,7 @@ bool TopBarWidget::paintConnectingState(
Painter &p,
int left,
int top,
int outerWidth,
crl::time ms) {
int outerWidth) {
if (!_connecting) {
return false;
}
@ -485,7 +481,7 @@ int TopBarWidget::countSelectedButtonsTop(float64 selectedShown) {
void TopBarWidget::updateControlsGeometry() {
auto hasSelected = (_selectedCount > 0);
auto selectedButtonsTop = countSelectedButtonsTop(_selectedShown.current(hasSelected ? 1. : 0.));
auto selectedButtonsTop = countSelectedButtonsTop(_selectedShown.value(hasSelected ? 1. : 0.));
auto otherButtonsTop = selectedButtonsTop + st::topBarHeight;
auto buttonsLeft = st::topBarActionSkip + (Adaptive::OneColumn() ? 0 : st::lineWidth);
auto buttonsWidth = _forward->contentWidth() + _delete->contentWidth() + _clear->width();
@ -541,7 +537,7 @@ void TopBarWidget::updateControlsGeometry() {
}
void TopBarWidget::finishAnimating() {
_selectedShown.finish();
_selectedShown.stop();
updateControlsVisibility();
}

12
Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#pragma once
#include "ui/rp_widget.h"
#include "ui/effects/animations.h"
#include "base/timer.h"
#include "dialogs/dialogs_key.h"
@ -86,19 +87,14 @@ private:
int countSelectedButtonsTop(float64 selectedShown);
void connectingAnimationCallback();
void paintTopBar(Painter &p, crl::time ms);
void paintTopBar(Painter &p);
void paintStatus(
Painter &p,
int left,
int top,
int availableWidth,
int outerWidth);
bool paintConnectingState(
Painter &p,
int left,
int top,
int outerWidth,
crl::time ms);
bool paintConnectingState(Painter &p, int left, int top, int outerWidth);
QRect getMembersShowAreaGeometry() const;
void updateMembersShowArea();
void updateOnlineDisplay();
@ -118,7 +114,7 @@ private:
bool _canDelete = false;
bool _canForward = false;
Animation _selectedShown;
Ui::Animations::Simple _selectedShown;
object_ptr<Ui::RoundButton> _clear;
object_ptr<Ui::RoundButton> _forward, _delete;

2
Telegram/SourceFiles/info/feed/info_feed_channels.cpp
View File

@ -218,7 +218,7 @@ void Channels::updateHeaderControlsGeometry(int newWidth) {
//auto searchShownLeft = st::infoIconPosition.x()
// - st::infoMembersSearch.iconPosition.x();
//auto searchHiddenLeft = availableWidth - _search->width();
//auto searchShown = _searchShownAnimation.current(_searchShown ? 1. : 0.);
//auto searchShown = _searchShownAnimation.value(_searchShown ? 1. : 0.);
//auto searchCurrentLeft = anim::interpolate(
// searchHiddenLeft,
// searchShownLeft,

2
Telegram/SourceFiles/info/feed/info_feed_channels_controllers.cpp
View File

@ -39,7 +39,6 @@ public:
QMargins actionMargins() const override;
void paintAction(
Painter &p,
crl::time ms,
int x,
int y,
int outerWidth,
@ -77,7 +76,6 @@ QMargins ChannelsController::Row::actionMargins() const {
void ChannelsController::Row::paintAction(
Painter &p,
crl::time ms,
int x,
int y,
int outerWidth,

3
Telegram/SourceFiles/info/info_top_bar.cpp
View File

@ -356,8 +356,7 @@ void TopBar::updateSelectionControlsGeometry(int newWidth) {
void TopBar::paintEvent(QPaintEvent *e) {
Painter p(this);
auto ms = crl::now();
auto highlight = _a_highlight.current(ms, _highlight ? 1. : 0.);
auto highlight = _a_highlight.value(_highlight ? 1. : 0.);
if (_highlight && !_a_highlight.animating()) {
_highlight = false;
startHighlightAnimation();

3
Telegram/SourceFiles/info/info_top_bar.h
View File

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/rp_widget.h"
#include "ui/wrap/fade_wrap.h"
#include "ui/effects/animations.h"
#include "ui/effects/numbers_animation.h"
#include "info/info_wrap_widget.h"
@ -130,7 +131,7 @@ private:
void registerToggleControlCallback(Widget *widget, IsVisible &&callback);
const style::InfoTopBar &_st;
Animation _a_highlight;
Ui::Animations::Simple _a_highlight;
bool _highlight = false;
QPointer<Ui::FadeWrap<Ui::IconButton>> _back;
std::vector<base::unique_qptr<Ui::RpWidget>> _buttons;

5
Telegram/SourceFiles/info/info_wrap_widget.h
View File

@ -7,9 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
#include <rpl/variable.h>
#include <rpl/event_stream.h>
#include "window/section_widget.h"
#include "ui/effects/animations.h"
namespace Storage {
enum class SharedMediaType : signed char;
@ -209,7 +208,7 @@ private:
//object_ptr<Ui::SettingsSlider> _topTabs = { nullptr };
object_ptr<TopBar> _topBar = { nullptr };
object_ptr<Ui::RpWidget> _topBarSurrogate = { nullptr };
Animation _topBarOverrideAnimation;
Ui::Animations::Simple _topBarOverrideAnimation;
bool _topBarOverrideShown = false;
object_ptr<Ui::FadeShadow> _topShadow;

5
Telegram/SourceFiles/info/profile/info_profile_button.cpp
View File

@ -77,11 +77,10 @@ void Button::setColorOverride(std::optional<QColor> textColorOverride) {
void Button::paintEvent(QPaintEvent *e) {
Painter p(this);
auto ms = crl::now();
auto paintOver = (isOver() || isDown()) && !isDisabled();
p.fillRect(e->rect(), paintOver ? _st.textBgOver : _st.textBg);
paintRipple(p, 0, 0, ms);
paintRipple(p, 0, 0);
auto outerw = width();
p.setFont(_st.font);
@ -99,7 +98,7 @@ void Button::paintEvent(QPaintEvent *e) {
if (_toggle) {
auto rect = toggleRect();
_toggle->paint(p, rect.left(), rect.top(), outerw, ms);
_toggle->paint(p, rect.left(), rect.top(), outerw);
}
}

8
Telegram/SourceFiles/info/profile/info_profile_cover.cpp
View File

@ -43,8 +43,7 @@ public:
Painter &p,
int left,
int top,
int outerWidth,
crl::time ms) override;
int outerWidth) override;
QImage prepareRippleMask() const override;
bool checkRippleStartPosition(QPoint position) const override;
@ -71,8 +70,7 @@ void SectionToggle::paint(
Painter &p,
int left,
int top,
int outerWidth,
crl::time ms) {
int outerWidth) {
auto sqrt2 = sqrt(2.);
auto vLeft = rtlpoint(left + _st.skip, 0, outerWidth).x() + 0.;
auto vTop = top + _st.skip + 0.;
@ -89,7 +87,7 @@ void SectionToggle::paint(
{ vLeft + (vWidth / 2.), vTop + (vHeight * 3. / 4.) + vStroke },
} };
auto toggled = currentAnimationValue(ms);
auto toggled = currentAnimationValue();
auto alpha = (toggled - 1.) * M_PI_2;
auto cosalpha = cos(alpha);
auto sinalpha = sin(alpha);

2
Telegram/SourceFiles/info/profile/info_profile_members.cpp
View File

@ -270,7 +270,7 @@ void Members::updateHeaderControlsGeometry(int newWidth) {
//auto searchShownLeft = st::infoIconPosition.x()
// - st::infoMembersSearch.iconPosition.x();
//auto searchHiddenLeft = availableWidth - _search->width();
//auto searchShown = _searchShownAnimation.current(_searchShown ? 1. : 0.);
//auto searchShown = _searchShownAnimation.value(_searchShown ? 1. : 0.);
//auto searchCurrentLeft = anim::interpolate(
// searchHiddenLeft,
// searchShownLeft,

2
Telegram/SourceFiles/info/profile/info_profile_members.h
View File

@ -117,7 +117,7 @@ private:
Ui::IconButton *_search = nullptr;
//Ui::CrossButton *_cancelSearch = nullptr;
//Animation _searchShownAnimation;
//Ui::Animations::Simple _searchShownAnimation;
//bool _searchShown = false;
//base::Timer _searchTimer;

1
Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp
View File

@ -49,7 +49,6 @@ QSize MemberListRow::actionSize() const {
void MemberListRow::paintAction(
Painter &p,
crl::time ms,
int x,
int y,
int outerWidth,

1
Telegram/SourceFiles/info/profile/info_profile_members_controllers.h
View File

@ -34,7 +34,6 @@ public:
QSize actionSize() const override;
void paintAction(
Painter &p,
crl::time ms,
int x,
int y,
int outerWidth,

10
Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
View File

@ -174,8 +174,8 @@ void Gif::paint(Painter &p, const QRect &clip, const PaintContext *context) cons
if (radial || _gif.isBad() || (!_gif && !loaded && !loading)) {
auto radialOpacity = (radial && loaded) ? _animation->radial.opacity() : 1.;
if (_animation && _animation->_a_over.animating(context->ms)) {
auto over = _animation->_a_over.current();
if (_animation && _animation->_a_over.animating()) {
auto over = _animation->_a_over.value(1.);
p.fillRect(r, anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, over));
} else {
auto over = (_state & StateFlag::Over);
@ -400,7 +400,7 @@ void Sticker::preload() const {
void Sticker::paint(Painter &p, const QRect &clip, const PaintContext *context) const {
bool loaded = getShownDocument()->loaded();
auto over = _a_over.current(context->ms, _active ? 1. : 0.);
auto over = _a_over.value(_active ? 1. : 0.);
if (over > 0) {
p.setOpacity(over);
App::roundRect(p, QRect(QPoint(0, 0), st::stickerPanSize), st::emojiPanHover, StickerHoverCorners);
@ -755,8 +755,8 @@ void File::paint(Painter &p, const QRect &clip, const PaintContext *context) con
auto inner = rtlrect(0, st::inlineRowMargin, st::msgFileSize, st::msgFileSize, _width);
p.setPen(Qt::NoPen);
if (isThumbAnimation(context->ms)) {
auto over = _animation->a_thumbOver.current();
if (isThumbAnimation()) {
auto over = _animation->a_thumbOver.value(1.);
p.setBrush(anim::brush(st::msgFileInBg, st::msgFileInBgOver, over));
} else {
bool over = ClickHandler::showAsActive(_document->loading() ? _cancel : _open);

13
Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.h
View File

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/flags.h"
#include "inline_bots/inline_bot_layout_item.h"
#include "ui/effects/animations.h"
#include "ui/effects/radial_animation.h"
#include "ui/text/text.h"
@ -103,11 +104,11 @@ private:
: radial(std::forward<Callback>(callback)) {
}
bool over = false;
Animation _a_over;
Ui::Animations::Simple _a_over;
Ui::RadialAnimation radial;
};
mutable std::unique_ptr<AnimationData> _animation;
mutable Animation _a_deleteOver;
mutable Ui::Animations::Simple _a_deleteOver;
};
@ -174,7 +175,7 @@ public:
private:
QSize getThumbSize() const;
mutable Animation _a_over;
mutable Ui::Animations::Simple _a_over;
mutable bool _active = false;
mutable QPixmap _thumb;
@ -261,9 +262,9 @@ private:
&& _animation->radial.animating()
&& radialAnimationCallback(now);
}
bool isThumbAnimation(crl::time ms) const {
bool isThumbAnimation() const {
if (_animation) {
if (_animation->a_thumbOver.animating(ms)) {
if (_animation->a_thumbOver.animating()) {
return true;
}
checkAnimationFinished();
@ -276,7 +277,7 @@ private:
AnimationData(Callback &&radialCallback)
: radial(std::forward<Callback>(radialCallback)) {
}
Animation a_thumbOver;
Ui::Animations::Simple a_thumbOver;
Ui::RadialAnimation radial;
};
mutable std::unique_ptr<AnimationData> _animation;

17
Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
View File

@ -804,12 +804,9 @@ void Widget::onWndActiveChanged() {
void Widget::paintEvent(QPaintEvent *e) {
Painter p(this);
auto ms = crl::now();
auto opacityAnimating = _a_opacity.animating();
// This call can finish _a_show animation and destroy _showAnimation.
auto opacityAnimating = _a_opacity.animating(ms);
auto showAnimating = _a_show.animating(ms);
auto showAnimating = _a_show.animating();
if (_showAnimation && !showAnimating) {
_showAnimation.reset();
if (!opacityAnimating) {
@ -819,11 +816,11 @@ void Widget::paintEvent(QPaintEvent *e) {
if (showAnimating) {
Assert(_showAnimation != nullptr);
if (auto opacity = _a_opacity.current(_hiding ? 0. : 1.)) {
_showAnimation->paintFrame(p, 0, 0, width(), _a_show.current(1.), opacity);
if (auto opacity = _a_opacity.value(_hiding ? 0. : 1.)) {
_showAnimation->paintFrame(p, 0, 0, width(), _a_show.value(1.), opacity);
}
} else if (opacityAnimating) {
p.setOpacity(_a_opacity.current(_hiding ? 0. : 1.));
p.setOpacity(_a_opacity.value(_hiding ? 0. : 1.));
p.drawPixmap(0, 0, _cache);
} else if (_hiding || isHidden()) {
hideFinished();
@ -853,7 +850,7 @@ void Widget::hideFast() {
if (isHidden()) return;
_hiding = false;
_a_opacity.finish();
_a_opacity.stop();
hideFinished();
}
@ -936,7 +933,7 @@ void Widget::hideFinished() {
_controller->disableGifPauseReason(Window::GifPauseReason::InlineResults);
_inner->hideFinish(true);
_a_show.finish();
_a_show.stop();
_showAnimation.reset();
_cache = QPixmap();
_horizontal = false;

5
Telegram/SourceFiles/inline_bots/inline_results_widget.h
View File

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/twidget.h"
#include "ui/abstract_button.h"
#include "ui/effects/animations.h"
#include "ui/effects/panel_animation.h"
#include "base/timer.h"
#include "mtproto/sender.h"
@ -245,11 +246,11 @@ private:
int _bottom = 0;
std::unique_ptr<Ui::PanelAnimation> _showAnimation;
Animation _a_show;
Ui::Animations::Simple _a_show;
bool _hiding = false;
QPixmap _cache;
Animation _a_opacity;
Ui::Animations::Simple _a_opacity;
bool _inPanelGrab = false;
object_ptr<Ui::ScrollArea> _scroll;

18
Telegram/SourceFiles/intro/introwidget.cpp
View File

@ -489,12 +489,12 @@ void Widget::showAnimated(const QPixmap &bgAnimCache, bool back) {
(_showBack ? _cacheOver : _cacheUnder) = bgAnimCache;
_a_show.finish();
_a_show.stop();
showControls();
(_showBack ? _cacheUnder : _cacheOver) = Ui::GrabWidget(this);
hideControls();
_a_show.start([this] { animationCallback(); }, 0., 1., st::slideDuration, Window::SlideAnimation::transition());
_a_show.start([=] { animationCallback(); }, 0., 1., st::slideDuration, Window::SlideAnimation::transition());
show();
}
@ -513,16 +513,12 @@ void Widget::paintEvent(QPaintEvent *e) {
bool trivial = (rect() == e->rect());
setMouseTracking(true);
if (_coverShownAnimation.animating()) {
_coverShownAnimation.step(crl::now());
}
QPainter p(this);
if (!trivial) {
p.setClipRect(e->rect());
}
p.fillRect(e->rect(), st::windowBg);
auto progress = _a_show.current(crl::now(), 1.);
auto progress = _a_show.value(1.);
if (_a_show.animating()) {
auto coordUnder = _showBack ? anim::interpolate(-st::slideShift, 0, progress) : anim::interpolate(0, -st::slideShift, progress);
auto coordOver = _showBack ? anim::interpolate(0, width(), progress) : anim::interpolate(width(), 0, progress);
@ -559,7 +555,7 @@ void Widget::resizeEvent(QResizeEvent *e) {
}
void Widget::updateControlsGeometry() {
auto shown = _coverShownAnimation.current(1.);
auto shown = _coverShownAnimation.value(1.);
auto controlsTopTo = getStep()->hasCover() ? st::introCoverHeight : 0;
auto controlsTop = anim::interpolate(_controlsTopFrom, controlsTopTo, shown);
@ -701,7 +697,7 @@ void Widget::Step::refreshLang() {
}
void Widget::Step::showFinished() {
_a_show.finish();
_a_show.stop();
_coverAnimation = CoverAnimation();
_slideAnimation.reset();
prepareCoverMask();
@ -710,7 +706,7 @@ void Widget::Step::showFinished() {
bool Widget::Step::paintAnimated(Painter &p, QRect clip) {
if (_slideAnimation) {
_slideAnimation->paintFrame(p, (width() - st::introStepWidth) / 2, contentTop(), width(), crl::now());
_slideAnimation->paintFrame(p, (width() - st::introStepWidth) / 2, contentTop(), width());
if (!_slideAnimation->animating()) {
showFinished();
return false;
@ -718,7 +714,7 @@ bool Widget::Step::paintAnimated(Painter &p, QRect clip) {
return true;
}
auto dt = _a_show.current(crl::now(), 1.);
auto dt = _a_show.value(1.);
if (!_a_show.animating()) {
if (hasCover()) {
paintCover(p, 0);

7
Telegram/SourceFiles/intro/introwidget.h
View File

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mtproto/sender.h"
#include "ui/rp_widget.h"
#include "ui/effects/animations.h"
#include "window/window_lock_widgets.h"
#include "core/core_cloud_password.h"
@ -219,7 +220,7 @@ public:
Fn<QString()> _errorTextFactory;
object_ptr<Ui::FadeWrap<Ui::FlatLabel>> _error = { nullptr };
Animation _a_show;
Ui::Animations::Simple _a_show;
CoverAnimation _coverAnimation;
std::unique_ptr<Ui::SlideAnimation> _slideAnimation;
QPixmap _coverMask;
@ -260,7 +261,7 @@ private:
void getNearestDC();
void showTerms(Fn<void()> callback);
Animation _a_show;
Ui::Animations::Simple _a_show;
bool _showBack = false;
QPixmap _cacheUnder, _cacheOver;
@ -268,7 +269,7 @@ private:
Data _data;
Animation _coverShownAnimation;
Ui::Animations::Simple _coverShownAnimation;
int _nextTopFrom = 0;
int _controlsTopFrom = 0;

12
Telegram/SourceFiles/mainwidget.cpp
View File

@ -1593,7 +1593,7 @@ void MainWidget::ui_showPeerHistory(
}
_controller->dialogsListFocused().set(false, true);
_a_dialogsWidth.finish();
_a_dialogsWidth.stop();
using Way = SectionShow::Way;
auto way = params.way;
@ -1922,7 +1922,7 @@ void MainWidget::showNewSection(
QPixmap animCache;
_controller->dialogsListFocused().set(false, true);
_a_dialogsWidth.finish();
_a_dialogsWidth.stop();
auto mainSectionTop = getMainSectionTop();
auto newMainGeometry = QRect(
@ -2230,7 +2230,7 @@ void MainWidget::showAnimated(const QPixmap &bgAnimCache, bool back) {
_showBack = back;
(_showBack ? _cacheOver : _cacheUnder) = bgAnimCache;
_a_show.finish();
_a_show.stop();
showAll();
(_showBack ? _cacheUnder : _cacheOver) = Ui::GrabWidget(this);
@ -2262,7 +2262,7 @@ void MainWidget::paintEvent(QPaintEvent *e) {
}
Painter p(this);
auto progress = _a_show.current(crl::now(), 1.);
auto progress = _a_show.value(1.);
if (_a_show.animating()) {
auto coordUnder = _showBack ? anim::interpolate(-st::slideShift, 0, progress) : anim::interpolate(0, -st::slideShift, progress);
auto coordOver = _showBack ? anim::interpolate(0, width(), progress) : anim::interpolate(width(), 0, progress);
@ -2374,7 +2374,7 @@ void MainWidget::resizeEvent(QResizeEvent *e) {
void MainWidget::updateControlsGeometry() {
updateWindowAdaptiveLayout();
if (session().settings().dialogsWidthRatio() > 0) {
_a_dialogsWidth.finish();
_a_dialogsWidth.stop();
}
if (!_a_dialogsWidth.animating()) {
_dialogs->stopWidthAnimation();
@ -2401,7 +2401,7 @@ void MainWidget::updateControlsGeometry() {
_thirdShadow.destroy();
}
auto mainSectionTop = getMainSectionTop();
auto dialogsWidth = qRound(_a_dialogsWidth.current(_dialogsWidth));
auto dialogsWidth = qRound(_a_dialogsWidth.value(_dialogsWidth));
if (Adaptive::OneColumn()) {
if (_callTopBar) {
_callTopBar->resizeToWidth(dialogsWidth);

5
Telegram/SourceFiles/mainwidget.h
View File

@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/timer.h"
#include "base/weak_ptr.h"
#include "ui/rp_widget.h"
#include "ui/effects/animations.h"
#include "media/player/media_player_float.h"
#include "data/data_pts_waiter.h"
@ -451,13 +452,13 @@ private:
not_null<Window::Controller*> _controller;
bool _started = false;
Animation _a_show;
Ui::Animations::Simple _a_show;
bool _showBack = false;
QPixmap _cacheUnder, _cacheOver;
int _dialogsWidth = 0;
int _thirdColumnWidth = 0;
Animation _a_dialogsWidth;
Ui::Animations::Simple _a_dialogsWidth;
object_ptr<Ui::PlainShadow> _sideShadow;
object_ptr<Ui::PlainShadow> _thirdShadow = { nullptr };

8
Telegram/SourceFiles/media/player/media_player_button.cpp
View File

@ -21,7 +21,7 @@ void PlayButtonLayout::setState(State state) {
if (_nextState == state) return;
_nextState = state;
if (!_transformProgress.animating(crl::now())) {
if (!_transformProgress.animating()) {
_oldState = _state;
_state = _nextState;
_transformBackward = false;
@ -37,16 +37,16 @@ void PlayButtonLayout::setState(State state) {
}
void PlayButtonLayout::finishTransform() {
_transformProgress.finish();
_transformProgress.stop();
_transformBackward = false;
if (_callback) _callback();
}
void PlayButtonLayout::paint(Painter &p, const QBrush &brush) {
if (_transformProgress.animating(crl::now())) {
if (_transformProgress.animating()) {
auto from = _oldState, to = _state;
auto backward = _transformBackward;
auto progress = _transformProgress.current(1.);
auto progress = _transformProgress.value(1.);
if (from == State::Cancel || (from == State::Pause && to == State::Play)) {
qSwap(from, to);
backward = !backward;

3
Telegram/SourceFiles/media/player/media_player_button.h
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#pragma once
#include "ui/abstract_button.h"
#include "ui/effects/animations.h"
#include "styles/style_media_player.h"
namespace Media {
@ -40,7 +41,7 @@ private:
State _state = State::Play;
State _oldState = State::Play;
State _nextState = State::Play;
Animation _transformProgress;
Ui::Animations::Simple _transformProgress;
bool _transformBackward = false;
Fn<void()> _callback;

6
Telegram/SourceFiles/media/player/media_player_float.cpp
View File

@ -458,7 +458,7 @@ std::optional<bool> FloatController::filterWheelEvent(
}
void FloatController::updatePosition(not_null<Item*> instance) {
auto visible = instance->visibleAnimation.current(instance->visible ? 1. : 0.);
auto visible = instance->visibleAnimation.value(instance->visible ? 1. : 0.);
if (visible == 0. && !instance->visible) {
instance->widget->hide();
if (instance->widget->detached()) {
@ -474,7 +474,7 @@ void FloatController::updatePosition(not_null<Item*> instance) {
instance->widget->show();
}
auto dragged = instance->draggedAnimation.current(1.);
auto dragged = instance->draggedAnimation.value(1.);
auto position = QPoint();
if (instance->hiddenByDrag) {
instance->widget->setOpacity(instance->widget->countOpacityByParent());
@ -604,7 +604,7 @@ void FloatController::finishDrag(not_null<Item*> instance, bool closed) {
instance->column = Auth().settings().floatPlayerColumn();
instance->corner = Auth().settings().floatPlayerCorner();
instance->draggedAnimation.finish();
instance->draggedAnimation.stop();
instance->draggedAnimation.start(
[=] { updatePosition(instance); },
0.,

5
Telegram/SourceFiles/media/player/media_player_float.h
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#pragma once
#include "ui/rp_widget.h"
#include "ui/effects/animations.h"
namespace Window {
class Controller;
@ -200,11 +201,11 @@ private:
bool hiddenByHistory = false;
bool visible = false;
RectPart animationSide;
Animation visibleAnimation;
Ui::Animations::Simple visibleAnimation;
Window::Column column;
RectPart corner;
QPoint dragFrom;
Animation draggedAnimation;
Ui::Animations::Simple draggedAnimation;
bool hiddenByDrag = false;
object_ptr<Float> widget;
};

12
Telegram/SourceFiles/media/player/media_player_panel.cpp
View File

@ -138,9 +138,9 @@ void Panel::paintEvent(QPaintEvent *e) {
Painter p(this);
if (!_cache.isNull()) {
bool animating = _a_appearance.animating(crl::now());
bool animating = _a_appearance.animating();
if (animating) {
p.setOpacity(_a_appearance.current(_hiding ? 0. : 1.));
p.setOpacity(_a_appearance.value(_hiding ? 0. : 1.));
} else if (_hiding || isHidden()) {
hideFinished();
return;
@ -168,7 +168,7 @@ void Panel::enterEventHook(QEvent *e) {
if (_ignoringEnterEvents || contentTooSmall()) return;
_hideTimer.cancel();
if (_a_appearance.animating(crl::now())) {
if (_a_appearance.animating()) {
startShow();
} else {
_showTimer.callOnce(0);
@ -181,7 +181,7 @@ void Panel::leaveEventHook(QEvent *e) {
return;
}
_showTimer.cancel();
if (_a_appearance.animating(crl::now())) {
if (_a_appearance.animating()) {
startHide();
} else {
_hideTimer.callOnce(300);
@ -191,7 +191,7 @@ void Panel::leaveEventHook(QEvent *e) {
void Panel::showFromOther() {
_hideTimer.cancel();
if (_a_appearance.animating(crl::now())) {
if (_a_appearance.animating()) {
startShow();
} else {
_showTimer.callOnce(300);
@ -200,7 +200,7 @@ void Panel::showFromOther() {
void Panel::hideFromOther() {
_showTimer.cancel();
if (_a_appearance.animating(crl::now())) {
if (_a_appearance.animating()) {
startHide();
} else {
_hideTimer.callOnce(0);

3
Telegram/SourceFiles/media/player/media_player_panel.h
View File

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/timer.h"
#include "ui/rp_widget.h"
#include "ui/effects/animations.h"
#include "info/info_controller.h"
namespace Window {
@ -90,7 +91,7 @@ private:
bool _hiding = false;
QPixmap _cache;
Animation _a_appearance;
Ui::Animations::Simple _a_appearance;
bool _ignoringEnterEvents = false;

20
Telegram/SourceFiles/media/player/media_player_volume_controller.cpp
View File

@ -117,9 +117,9 @@ void VolumeWidget::paintEvent(QPaintEvent *e) {
Painter p(this);
if (!_cache.isNull()) {
bool animating = _a_appearance.animating(crl::now());
bool animating = _a_appearance.animating();
if (animating) {
p.setOpacity(_a_appearance.current(_hiding));
p.setOpacity(_a_appearance.value(_hiding ? 0. : 1.));
} else if (_hiding || isHidden()) {
hidingFinished();
return;
@ -142,7 +142,7 @@ void VolumeWidget::paintEvent(QPaintEvent *e) {
void VolumeWidget::enterEventHook(QEvent *e) {
_hideTimer.stop();
if (_a_appearance.animating(crl::now())) {
if (_a_appearance.animating()) {
onShowStart();
} else {
_showTimer.start(0);
@ -152,7 +152,7 @@ void VolumeWidget::enterEventHook(QEvent *e) {
void VolumeWidget::leaveEventHook(QEvent *e) {
_showTimer.stop();
if (_a_appearance.animating(crl::now())) {
if (_a_appearance.animating()) {
onHideStart();
} else {
_hideTimer.start(300);
@ -162,7 +162,7 @@ void VolumeWidget::leaveEventHook(QEvent *e) {
void VolumeWidget::otherEnter() {
_hideTimer.stop();
if (_a_appearance.animating(crl::now())) {
if (_a_appearance.animating()) {
onShowStart();
} else {
_showTimer.start(0);
@ -171,7 +171,7 @@ void VolumeWidget::otherEnter() {
void VolumeWidget::otherLeave() {
_showTimer.stop();
if (_a_appearance.animating(crl::now())) {
if (_a_appearance.animating()) {
onHideStart();
} else {
_hideTimer.start(0);
@ -196,14 +196,16 @@ void VolumeWidget::onHideStart() {
}
void VolumeWidget::startAnimation() {
auto from = _hiding ? 1. : 0.;
auto to = _hiding ? 0. : 1.;
if (_cache.isNull()) {
showChildren();
_cache = Ui::GrabWidget(this);
}
hideChildren();
_a_appearance.start([this] { appearanceCallback(); }, from, to, st::defaultInnerDropdown.duration);
_a_appearance.start(
[=] { appearanceCallback(); },
_hiding ? 1. : 0.,
_hiding ? 0. : 1.,
st::defaultInnerDropdown.duration);
}
void VolumeWidget::appearanceCallback() {

4
Telegram/SourceFiles/media/player/media_player_volume_controller.h
View File

@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
#include "ui/effects/animations.h"
namespace Ui {
class IconButton;
class MediaSlider;
@ -66,7 +68,7 @@ private:
bool _hiding = false;
QPixmap _cache;
Animation _a_appearance;
Ui::Animations::Simple _a_appearance;
QTimer _hideTimer, _showTimer;

2
Telegram/SourceFiles/media/player/media_player_widget.cpp
View File

@ -62,7 +62,7 @@ Widget::PlayButton::PlayButton(QWidget *parent) : Ui::RippleButton(parent, st::m
void Widget::PlayButton::paintEvent(QPaintEvent *e) {
Painter p(this);
paintRipple(p, st::mediaPlayerButton.rippleAreaPosition.x(), st::mediaPlayerButton.rippleAreaPosition.y(), crl::now());
paintRipple(p, st::mediaPlayerButton.rippleAreaPosition.x(), st::mediaPlayerButton.rippleAreaPosition.y());
p.translate(st::mediaPlayerButtonPosition.x(), st::mediaPlayerButtonPosition.y());
_layout.paint(p, st::mediaPlayerActiveFg);
}

11
Telegram/SourceFiles/media/view/media_view_group_thumbs.cpp
View File

@ -624,7 +624,7 @@ void GroupThumbs::clear() {
}
void GroupThumbs::startDelayedAnimation() {
_animation.finish();
_animation.stop();
_waitingForAnimationStart = true;
countUpdatedRect();
}
@ -661,15 +661,10 @@ void GroupThumbs::update() {
_updateRequests.fire_copy(_updatedRect);
}
void GroupThumbs::paint(
Painter &p,
int x,
int y,
int outerWidth,
crl::time ms) {
void GroupThumbs::paint(Painter &p, int x, int y, int outerWidth) {
const auto progress = _waitingForAnimationStart
? 0.
: _animation.current(ms, 1.);
: _animation.value(1.);
x += (_width / 2);
y += st::mediaviewGroupPadding.top();
for (auto i = _cache.begin(); i != _cache.end();) {

5
Telegram/SourceFiles/media/view/media_view_group_thumbs.h
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#pragma once
#include "history/history_item_components.h"
#include "ui/effects/animations.h"
#include "base/weak_ptr.h"
class SharedMediaWithLastSlice;
@ -57,7 +58,7 @@ public:
bool hidden() const;
void checkForAnimationStart();
void paint(Painter &p, int x, int y, int outerWidth, crl::time ms);
void paint(Painter &p, int x, int y, int outerWidth);
ClickHandlerPtr getState(QPoint point) const;
rpl::producer<QRect> updateRequests() const {
@ -112,7 +113,7 @@ private:
Context _context;
bool _waitingForAnimationStart = true;
Animation _animation;
Ui::Animations::Simple _animation;
std::vector<not_null<Thumb*>> _items;
std::vector<not_null<Thumb*>> _dying;
base::flat_map<Key, std::unique_ptr<Thumb>> _cache;

3
Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
View File

@ -2652,8 +2652,7 @@ void OverlayWidget::paintEvent(QPaintEvent *e) {
p,
_groupThumbsLeft,
_groupThumbsTop,
width(),
ms);
width());
if (_groupThumbs->hidden()) {
_groupThumbs = nullptr;
_groupThumbsRect = QRect();

22
Telegram/SourceFiles/overview/overview_layout.cpp
View File

@ -72,7 +72,7 @@ public:
, _check(st, _updateCallback) {
}
void paint(Painter &p, crl::time ms, QPoint position, int outerWidth, bool selected, bool selecting);
void paint(Painter &p, QPoint position, int outerWidth, bool selected, bool selecting);
void setActive(bool active);
void setPressed(bool pressed);
@ -87,18 +87,18 @@ private:
Fn<void()> _updateCallback;
Ui::RoundCheckbox _check;
Animation _pression;
Ui::Animations::Simple _pression;
bool _active = false;
bool _pressed = false;
};
void Checkbox::paint(Painter &p, crl::time ms, QPoint position, int outerWidth, bool selected, bool selecting) {
void Checkbox::paint(Painter &p, QPoint position, int outerWidth, bool selected, bool selecting) {
_check.setDisplayInactive(selecting);
_check.setChecked(selected);
const auto pression = _pression.current(ms, (_active && _pressed) ? 1. : 0.);
const auto pression = _pression.value((_active && _pressed) ? 1. : 0.);
const auto masterScale = 1. - (1. - st::overviewCheckPressedSize) * pression;
_check.paint(p, ms, position.x(), position.y(), outerWidth, masterScale);
_check.paint(p, position.x(), position.y(), outerWidth, masterScale);
}
void Checkbox::setActive(bool active) {
@ -167,7 +167,7 @@ void ItemBase::paintCheckbox(
ensureCheckboxCreated();
}
if (_check) {
_check->paint(p, context->ms, position, _width, selected, context->selecting);
_check->paint(p, position, _width, selected, context->selecting);
}
}
@ -491,7 +491,7 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
p.setBrush(st::msgDateImgBgSelected);
} else {
auto over = ClickHandler::showAsActive((_data->loading() || _data->uploading()) ? _cancell : (loaded || _data->canBePlayed()) ? _openl : _savel);
p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, _a_iconOver.current(context->ms, over ? 1. : 0.)));
p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, _a_iconOver.value(over ? 1. : 0.)));
}
{
@ -670,10 +670,10 @@ void Voice::paint(Painter &p, const QRect &clip, TextSelection selection, const
p.setBrush((thumbLoaded || blurred) ? st::msgDateImgBgSelected : st::msgFileInBgSelected);
} else if (_data->hasThumbnail()) {
auto over = ClickHandler::showAsActive(checkLink);
p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, _a_iconOver.current(context->ms, over ? 1. : 0.)));
p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, _a_iconOver.value(over ? 1. : 0.)));
} else {
auto over = ClickHandler::showAsActive(checkLink);
p.setBrush(anim::brush(st::msgFileInBg, st::msgFileInBgOver, _a_iconOver.current(context->ms, over ? 1. : 0.)));
p.setBrush(anim::brush(st::msgFileInBg, st::msgFileInBgOver, _a_iconOver.value(over ? 1. : 0.)));
}
{
PainterHighQualityEnabler hq(p);
@ -948,7 +948,7 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
p.setBrush(st::msgFileInBgSelected);
} else {
auto over = ClickHandler::showAsActive((!cornerDownload && (_data->loading() || _data->uploading())) ? _cancell : (loaded || _data->canBePlayed()) ? _openl : _savel);
p.setBrush(anim::brush(_st.songIconBg, _st.songOverBg, _a_iconOver.current(context->ms, over ? 1. : 0.)));
p.setBrush(anim::brush(_st.songIconBg, _st.songOverBg, _a_iconOver.value(over ? 1. : 0.)));
}
{
@ -1026,7 +1026,7 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
p.setBrush(wthumb ? st::msgDateImgBgSelected : documentSelectedColor(_colorIndex));
} else {
auto over = ClickHandler::showAsActive(_data->loading() ? _cancell : _savel);
p.setBrush(anim::brush(wthumb ? st::msgDateImgBg : documentDarkColor(_colorIndex), wthumb ? st::msgDateImgBgOver : documentOverColor(_colorIndex), _a_iconOver.current(context->ms, over ? 1. : 0.)));
p.setBrush(anim::brush(wthumb ? st::msgDateImgBg : documentDarkColor(_colorIndex), wthumb ? st::msgDateImgBgOver : documentOverColor(_colorIndex), _a_iconOver.value(over ? 1. : 0.)));
}
p.setOpacity(radialOpacity * p.opacity());

3
Telegram/SourceFiles/overview/overview_layout.h
View File

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "layout.h"
#include "core/click_handler_types.h"
#include "ui/effects/animations.h"
#include "ui/effects/radial_animation.h"
#include "styles/style_overview.h"
@ -148,7 +149,7 @@ protected:
}
mutable std::unique_ptr<Ui::RadialAnimation> _radial;
Animation _a_iconOver;
Ui::Animations::Simple _a_iconOver;
};

40
Telegram/SourceFiles/passport/passport_panel_details_row.cpp
View File

@ -124,7 +124,7 @@ private:
object_ptr<Ui::LinkButton> _link;
rpl::variable<QString> _value;
bool _errorShown = false;
Animation _errorAnimation;
Ui::Animations::Simple _errorAnimation;
};
@ -197,14 +197,14 @@ private:
rpl::variable<QString> _value;
style::cursor _cursor = style::cur_default;
Animation _a_borderShown;
Ui::Animations::Simple _a_borderShown;
int _borderAnimationStart = 0;
Animation _a_borderOpacity;
Ui::Animations::Simple _a_borderOpacity;
bool _borderVisible = false;
Animation _a_error;
Ui::Animations::Simple _a_error;
bool _error = false;
Animation _a_focused;
Ui::Animations::Simple _a_focused;
bool _focused = false;
};
@ -248,7 +248,7 @@ private:
rpl::variable<QString> _value;
bool _errorShown = false;
Animation _errorAnimation;
Ui::Animations::Simple _errorAnimation;
};
@ -344,7 +344,7 @@ void CountryRow::showInnerError() {
void CountryRow::finishInnerAnimating() {
if (_errorAnimation.animating()) {
_errorAnimation.finish();
_errorAnimation.stop();
errorAnimationCallback();
}
}
@ -365,7 +365,7 @@ void CountryRow::toggleError(bool shown) {
}
void CountryRow::errorAnimationCallback() {
const auto error = _errorAnimation.current(_errorShown ? 1. : 0.);
const auto error = _errorAnimation.value(_errorShown ? 1. : 0.);
if (error == 0.) {
_link->setColorOverride(std::nullopt);
} else {
@ -676,11 +676,10 @@ void DateRow::paintEvent(QPaintEvent *e) {
if (_st.border) {
p.fillRect(0, height - _st.border, width, _st.border, _st.borderFg);
}
const auto ms = crl::now();
auto errorDegree = _a_error.current(ms, _error ? 1. : 0.);
auto focusedDegree = _a_focused.current(ms, _focused ? 1. : 0.);
auto borderShownDegree = _a_borderShown.current(ms, 1.);
auto borderOpacity = _a_borderOpacity.current(ms, _borderVisible ? 1. : 0.);
auto errorDegree = _a_error.value(_error ? 1. : 0.);
auto focusedDegree = _a_focused.value(_focused ? 1. : 0.);
auto borderShownDegree = _a_borderShown.value(1.);
auto borderOpacity = _a_borderOpacity.value(_borderVisible ? 1. : 0.);
if (_st.borderActive && (borderOpacity > 0.)) {
auto borderStart = snap(_borderAnimationStart, 0, width);
auto borderFrom = qRound(borderStart * (1. - borderShownDegree));
@ -818,9 +817,9 @@ void DateRow::finishInnerAnimating() {
_day->finishAnimating();
_month->finishAnimating();
_year->finishAnimating();
_a_borderOpacity.finish();
_a_borderShown.finish();
_a_error.finish();
_a_borderOpacity.stop();
_a_borderShown.stop();
_a_error.stop();
}
void DateRow::startBorderAnimation() {
@ -914,7 +913,7 @@ void GenderRow::showInnerError() {
void GenderRow::finishInnerAnimating() {
if (_errorAnimation.animating()) {
_errorAnimation.finish();
_errorAnimation.stop();
errorAnimationCallback();
}
}
@ -935,7 +934,7 @@ void GenderRow::toggleError(bool shown) {
}
void GenderRow::errorAnimationCallback() {
const auto error = _errorAnimation.current(_errorShown ? 1. : 0.);
const auto error = _errorAnimation.value(_errorShown ? 1. : 0.);
if (error == 0.) {
_maleRadio->setUntoggledOverride(std::nullopt);
_femaleRadio->setUntoggledOverride(std::nullopt);
@ -1107,7 +1106,7 @@ void PanelDetailsRow::finishAnimating() {
_error->finishAnimating();
}
if (_errorAnimation.animating()) {
_errorAnimation.finish();
_errorAnimation.stop();
update();
}
}
@ -1115,8 +1114,7 @@ void PanelDetailsRow::finishAnimating() {
void PanelDetailsRow::paintEvent(QPaintEvent *e) {
Painter p(this);
const auto ms = crl::now();
const auto error = _errorAnimation.current(ms, _errorShown ? 1. : 0.);
const auto error = _errorAnimation.value(_errorShown ? 1. : 0.);
p.setFont(st::semiboldFont);
p.setPen(anim::pen(
st::passportDetailsField.placeholderFg,

3
Telegram/SourceFiles/passport/passport_panel_details_row.h
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#pragma once
#include "ui/rp_widget.h"
#include "ui/effects/animations.h"
#include "ui/wrap/padding_wrap.h"
#include "ui/widgets/labels.h"
#include "boxes/abstract_box.h"
@ -76,7 +77,7 @@ private:
object_ptr<Ui::SlideWrap<Ui::FlatLabel>> _error = { nullptr };
bool _errorShown = false;
bool _errorHideSubscription = false;
Animation _errorAnimation;
Ui::Animations::Simple _errorAnimation;
};

6
Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
View File

@ -119,7 +119,7 @@ struct EditScans::SpecialScan {
base::unique_qptr<Ui::SlideWrap<ScanButton>> row;
QPointer<Info::Profile::Button> upload;
bool errorShown = false;
Animation errorAnimation;
Ui::Animations::Simple errorAnimation;
rpl::variable<bool> rowCreated;
};
@ -231,7 +231,7 @@ void EditScans::List::toggleError(bool shown) {
}
void EditScans::List::errorAnimationCallback() {
const auto error = errorAnimation.current(errorShown ? 1. : 0.);
const auto error = errorAnimation.value(errorShown ? 1. : 0.);
if (error == 0.) {
upload->setColorOverride(std::nullopt);
} else {
@ -972,7 +972,7 @@ void EditScans::toggleSpecialScanError(FileType type, bool shown) {
void EditScans::specialScanErrorAnimationCallback(FileType type) {
auto &scan = findSpecialScan(type);
const auto error = scan.errorAnimation.current(
const auto error = scan.errorAnimation.value(
scan.errorShown ? 1. : 0.);
if (error == 0.) {
scan.upload->setColorOverride(std::nullopt);

Some files were not shown because too many files have changed in this diff Show More