Don't update radial animations in cycle.

Telegram/SourceFiles/boxes/background_preview_box.cpp

@@ -398,7 +398,7 @@ BackgroundPreviewBox::BackgroundPreviewBox(
 	lang(lng_background_text2),
 	true))
 , _paper(paper)
-, _radial([=](crl::time now) { return radialAnimationCallback(now); }) {
+, _radial([=](crl::time now) { radialAnimationCallback(now); }) {
 	subscribe(Auth().downloaderTaskFinished(), [=] { update(); });
 }
 

Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp

@@ -120,12 +120,10 @@ private:
 	void setupPreview(const Set &set);
 	void setupAnimation();
 	void paintPreview(Painter &p) const;
-	void paintRadio(Painter &p, crl::time now);
+	void paintRadio(Painter &p);
-	void updateAnimation(crl::time now);
 	void setupHandler();
 	void load();
-
+	void radialAnimationCallback(crl::time now);
-	void radialAnimationCallback();
 
 	int _id = 0;
 	bool _switching = false;
@@ -358,7 +356,7 @@ void Row::paintEvent(QPaintEvent *e) {
 
 	paintRipple(p, 0, 0);
 	paintPreview(p);
-	paintRadio(p, crl::now());
+	paintRadio(p);
 }
 
 void Row::paintPreview(Painter &p) const {
@@ -376,9 +374,7 @@ void Row::paintPreview(Painter &p) const {
 	}
 }
 
-void Row::paintRadio(Painter &p, crl::time now) {
+void Row::paintRadio(Painter &p) {
-	updateAnimation(now);
-
 	const auto loading = _loading
 		? _loading->computeState()
 		: Ui::RadialState{ 0., 0, FullArcLength };
@@ -581,8 +577,18 @@ void Row::setupPreview(const Set &set) {
 	}
 }
 
-void Row::radialAnimationCallback() {
+void Row::radialAnimationCallback(crl::time now) {
-	if (!anim::Disabled()) {
+	const auto updated = [&] {
+		const auto state = _state.current();
+		if (const auto loading = base::get_if<Loading>(&state)) {
+			const auto progress = (loading->size > 0)
+				? (loading->already / float64(loading->size))
+				: 0.;
+			return _loading->update(progress, false, now);
+		}
+		return false;
+	}();
+	if (!anim::Disabled() || updated) {
 		update();
 	}
 }
@@ -619,34 +625,31 @@ void Row::setupAnimation() {
 			st::defaultRadio.duration);
 	}, lifetime());
 
+	_state.value(
+	) | rpl::map([](const SetState &state) {
+		return base::get_if<Loading>(&state);
+	}) | rpl::distinct_until_changed(
+	) | rpl::start_with_next([=](const Loading *loading) {
+		if (loading && !_loading) {
+			_loading = std::make_unique<Ui::RadialAnimation>(
+				[=](crl::time now) { radialAnimationCallback(now); });
+			const auto progress = (loading->size > 0)
+				? (loading->already / float64(loading->size))
+				: 0.;
+			_loading->start(progress);
+		} else if (!loading && _loading) {
+			_loading->update(
+				_state.current().is<Failed>() ? 0. : 1.,
+				true,
+				crl::now());
+		}
+	}, lifetime());
+
 	_toggled.stop();
 	_active.stop();
 	updateStatusColorOverride();
 }
 
-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)
-			? (loading->already / float64(loading->size))
-			: 0.;
-		if (!_loading) {
-			_loading = std::make_unique<Ui::RadialAnimation>(
-				[=] { radialAnimationCallback(); });
-			_loading->start(progress);
-		} else {
-			_loading->update(progress, false, now);
-		}
-	} else if (_loading) {
-		_loading->update(state.is<Failed>() ? 0. : 1., true, now);
-	} else {
-		_loading = nullptr;
-	}
-	if (_loading && !_loading->animating()) {
-		_loading = nullptr;
-	}
-}
-
 } // namespace
 
 ManageSetsBox::ManageSetsBox(QWidget*) {

Telegram/SourceFiles/history/media/history_media_document.cpp

@@ -223,8 +223,8 @@ void HistoryDocument::draw(Painter &p, const QRect &r, TextSelection selection,
 			_animation->radial.start(_data->progress());
 		}
 	}
-	bool showPause = updateStatusText();
+	const auto showPause = updateStatusText();
-	bool radial = isRadialAnimation(ms);
+	const auto radial = isRadialAnimation();
 
 	auto topMinus = isBubbleTop() ? 0 : st::msgFileTopMinus;
 	int nameleft = 0, nametop = 0, nameright = 0, statustop = 0, linktop = 0, bottom = 0;

Telegram/SourceFiles/history/media/history_media_file.cpp

@@ -67,27 +67,25 @@ void HistoryFileMedia::setStatusSize(int newSize, int fullSize, int duration, qi
 	}
 }
 
-bool HistoryFileMedia::radialAnimationCallback(crl::time now) const {
+void HistoryFileMedia::radialAnimationCallback(crl::time now) const {
-	const auto radialUpdated = [&] {
+	const auto updated = [&] {
 		return _animation->radial.update(
 			dataProgress(),
 			dataFinished(),
 			now);
 	}();
-	if (!anim::Disabled() || radialUpdated) {
+	if (!anim::Disabled() || updated) {
 		history()->owner().requestViewRepaint(_parent);
 	}
 	if (!_animation->radial.animating()) {
 		checkAnimationFinished();
-		return false;
 	}
-	return true;
 }
 
 void HistoryFileMedia::ensureAnimation() const {
 	if (!_animation) {
 		_animation = std::make_unique<AnimationData>([=](crl::time now) {
-			return radialAnimationCallback(now);
+			radialAnimationCallback(now);
 		});
 	}
 }

Telegram/SourceFiles/history/media/history_media_file.h

@@ -63,16 +63,20 @@ protected:
 	// duration = -1 - no duration, duration = -2 - "GIF" duration
 	void setStatusSize(int newSize, int fullSize, int duration, qint64 realDuration) const;
 
-	bool radialAnimationCallback(crl::time now) const;
+	void radialAnimationCallback(crl::time now) const;
 	void thumbAnimationCallback();
 
 	void ensureAnimation() const;
 	void checkAnimationFinished() const;
 
-	bool isRadialAnimation(crl::time now) const {
+	bool isRadialAnimation() const {
-		return _animation
+		if (_animation) {
-			&& _animation->radial.animating()
+			if (_animation->radial.animating()) {
-			&& radialAnimationCallback(now);
+				return true;
+			}
+			checkAnimationFinished();
+		}
+		return false;
 	}
 	bool isThumbAnimation() const {
 		if (_animation) {

Telegram/SourceFiles/history/media/history_media_gif.cpp

@@ -252,7 +252,7 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, crl::
 
 	auto captionw = paintw - st::msgPadding.left() - st::msgPadding.right();
 
-	auto isRound = _data->isVideoMessage();
+	const auto isRound = _data->isVideoMessage();
 	auto displayMute = false;
 	const auto player = activeRoundPlayer();
 	const auto reader = player ? nullptr : currentReader();
@@ -265,7 +265,7 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, crl::
 		}
 	}
 	updateStatusText();
-	auto radial = isRadialAnimation(ms);
+	const auto radial = isRadialAnimation();
 
 	if (bubble) {
 		if (!_caption.isEmpty()) {

Telegram/SourceFiles/history/media/history_media_photo.cpp

@@ -164,7 +164,7 @@ void HistoryPhoto::draw(Painter &p, const QRect &r, TextSelection selection, crl
 			_animation->radial.start(_data->progress());
 		}
 	}
-	bool radial = isRadialAnimation(ms);
+	const auto radial = isRadialAnimation();
 
 	auto rthumb = rtlrect(paintx, painty, paintw, painth, width());
 	if (_serviceWidth > 0) {
@@ -365,7 +365,7 @@ void HistoryPhoto::drawGrouped(
 			_animation->radial.start(_data->progress());
 		}
 	}
-	const auto radial = isRadialAnimation(ms);
+	const auto radial = isRadialAnimation();
 
 	if (!bubble) {
 //		App::roundShadow(p, 0, 0, paintw, painth, selected ? st::msgInShadowSelected : st::msgInShadow, selected ? InSelectedShadowCorners : InShadowCorners);

Telegram/SourceFiles/history/media/history_media_video.cpp

@@ -170,7 +170,7 @@ void HistoryVideo::draw(Painter &p, const QRect &r, TextSelection selection, crl
 		}
 	}
 	updateStatusText();
-	bool radial = isRadialAnimation(ms);
+	const auto radial = isRadialAnimation();
 
 	if (bubble) {
 		if (!_caption.isEmpty()) {
@@ -405,7 +405,7 @@ void HistoryVideo::drawGrouped(
 			_animation->radial.start(_data->progress());
 		}
 	}
-	const auto radial = isRadialAnimation(ms);
+	const auto radial = isRadialAnimation();
 
 	if (!bubble) {
 //		App::roundShadow(p, 0, 0, paintw, painth, selected ? st::msgInShadowSelected : st::msgInShadow, selected ? InSelectedShadowCorners : InShadowCorners);

Telegram/SourceFiles/history/media/history_media_wall_paper.cpp

@@ -109,7 +109,7 @@ void HistoryWallPaper::draw(Painter &p, const QRect &r, TextSelection selection,
 			_animation->radial.start(_data->progress());
 		}
 	}
-	bool radial = isRadialAnimation(ms);
+	const auto radial = isRadialAnimation();
 
 	auto rthumb = rtlrect(paintx, painty, paintw, painth, width());
 	auto roundRadius = ImageRoundRadius::Small;

Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp

@@ -146,14 +146,14 @@ void Gif::paint(Painter &p, const QRect &clip, const PaintContext *context) cons
 		if (_gif) _gif->setAutoplay();
 	}
 
-	bool animating = (_gif && _gif->started());
+	const auto animating = (_gif && _gif->started());
 	if (displayLoading) {
 		ensureAnimation();
 		if (!_animation->radial.animating()) {
 			_animation->radial.start(document->progress());
 		}
 	}
-	bool radial = isRadialAnimation(context->ms);
+	const auto radial = isRadialAnimation();
 
 	int32 height = st::inlineMediaHeight;
 	QSize frame = countFrameSize();
@@ -322,33 +322,36 @@ void Gif::prepareThumbnail(QSize size, QSize frame) const {
 void Gif::ensureAnimation() const {
 	if (!_animation) {
 		_animation = std::make_unique<AnimationData>([=](crl::time now) {
-			return radialAnimationCallback(now);
+			radialAnimationCallback(now);
 		});
 	}
 }
 
-bool Gif::isRadialAnimation(crl::time now) const {
+bool Gif::isRadialAnimation() const {
-	return _animation
+	if (_animation) {
-		&& _animation->radial.animating()
+		if (_animation->radial.animating()) {
-		&& radialAnimationCallback(now);
+			return true;
+		} else if (getShownDocument()->loaded()) {
+			_animation = nullptr;
+		}
+	}
+	return false;
 }
 
-bool Gif::radialAnimationCallback(crl::time now) const {
+void Gif::radialAnimationCallback(crl::time now) const {
 	const auto document = getShownDocument();
-	const auto radialUpdated = [&] {
+	const auto updated = [&] {
 		return _animation->radial.update(
 			document->progress(),
 			!document->loading() || document->loaded(),
 			now);
 	}();
-	if (!anim::Disabled() || radialUpdated) {
+	if (!anim::Disabled() || updated) {
 		update();
 	}
 	if (!_animation->radial.animating() && document->loaded()) {
-		_animation.reset();
+		_animation = nullptr;
-		return false;
 	}
-	return true;
 }
 
 void Gif::clipCallback(Media::Clip::Notification notification) {
@@ -750,8 +753,8 @@ void File::paint(Painter &p, const QRect &clip, const PaintContext *context) con
 			_animation->radial.start(_document->progress());
 		}
 	}
-	bool showPause = updateStatusText();
+	const auto showPause = updateStatusText();
-	bool radial = isRadialAnimation(context->ms);
+	const auto radial = isRadialAnimation();
 
 	auto inner = rtlrect(0, st::inlineRowMargin, st::msgFileSize, st::msgFileSize, _width);
 	p.setPen(Qt::NoPen);
@@ -844,21 +847,19 @@ void File::thumbAnimationCallback() {
 	update();
 }
 
-bool File::radialAnimationCallback(crl::time now) const {
+void File::radialAnimationCallback(crl::time now) const {
-	const auto radialUpdated = [&] {
+	const auto updated = [&] {
 		return _animation->radial.update(
 			_document->progress(),
 			!_document->loading() || _document->loaded(),
 			now);
 	}();
-	if (!anim::Disabled() || radialUpdated) {
+	if (!anim::Disabled() || updated) {
 		update();
 	}
 	if (!_animation->radial.animating()) {
 		checkAnimationFinished();
-		return false;
 	}
-	return true;
 }
 
 void File::ensureAnimation() const {
@@ -1258,7 +1259,7 @@ void Game::paint(Painter &p, const QRect &clip, const PaintContext *context) con
 				_radial->start(document->progress());
 			}
 		}
-		radial = isRadialAnimation(context->ms);
+		radial = isRadialAnimation();
 
 		if (animating) {
 			if (!_thumb.isNull()) _thumb = QPixmap();
@@ -1361,28 +1362,31 @@ void Game::validateThumbnail(Image *image, QSize size, bool good) const {
 		size.height());
 }
 
-bool Game::isRadialAnimation(crl::time now) const {
+bool Game::isRadialAnimation() const {
-	return _radial
+	if (_radial) {
-		&& _radial->animating()
+		if (_radial->animating()) {
-		&& radialAnimationCallback(now);
+			return true;
+		} else if (getResultDocument()->loaded()) {
+			_radial = nullptr;
+		}
+	}
+	return false;
 }
 
-bool Game::radialAnimationCallback(crl::time now) const {
+void Game::radialAnimationCallback(crl::time now) const {
 	const auto document = getResultDocument();
-	const auto radialUpdated = [&] {
+	const auto updated = [&] {
 		return _radial->update(
 			document->progress(),
 			!document->loading() || document->loaded(),
 			now);
 	}();
-	if (!anim::Disabled() || radialUpdated) {
+	if (!anim::Disabled() || updated) {
 		update();
 	}
 	if (!_radial->animating() && document->loaded()) {
-		_radial.reset();
+		_radial = nullptr;
-		return false;
 	}
-	return true;
 }
 
 void Game::clipCallback(Media::Clip::Notification notification) {

Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.h

@@ -93,8 +93,8 @@ private:
 	void prepareThumbnail(QSize size, QSize frame) const;
 
 	void ensureAnimation() const;
-	bool isRadialAnimation(crl::time now) const;
+	bool isRadialAnimation() const;
-	bool radialAnimationCallback(crl::time now) const;
+	void radialAnimationCallback(crl::time now) const;
 
 	void clipCallback(Media::Clip::Notification notification);
 
@@ -251,16 +251,20 @@ public:
 
 private:
 	void thumbAnimationCallback();
-	bool radialAnimationCallback(crl::time now) const;
+	void radialAnimationCallback(crl::time now) const;
 
 	void ensureAnimation() const;
 	void checkAnimationFinished() const;
 	bool updateStatusText() const;
 
-	bool isRadialAnimation(crl::time now) const {
+	bool isRadialAnimation() const {
-		return _animation
+		if (_animation) {
-			&& _animation->radial.animating()
+			if (_animation->radial.animating()) {
-			&& radialAnimationCallback(now);
+				return true;
+			}
+			checkAnimationFinished();
+		}
+		return false;
 	}
 	bool isThumbAnimation() const {
 		if (_animation) {
@@ -362,8 +366,8 @@ private:
 	void prepareThumbnail(QSize size) const;
 	void validateThumbnail(Image *image, QSize size, bool good) const;
 
-	bool isRadialAnimation(crl::time now) const;
+	bool isRadialAnimation() const;
-	bool radialAnimationCallback(crl::time now) const;
+	void radialAnimationCallback(crl::time now) const;
 
 	void clipCallback(Media::Clip::Notification notification);
 

Telegram/SourceFiles/overview/overview_layout.cpp

@@ -218,24 +218,22 @@ void RadialProgressItem::setLinks(
 	_cancell = std::move(cancell);
 }
 
-bool RadialProgressItem::radialAnimationCallback(crl::time now) const {
+void RadialProgressItem::radialAnimationCallback(crl::time now) const {
-	const auto radialUpdated = [&] {
+	const auto updated = [&] {
 		return _radial->update(dataProgress(), dataFinished(), now);
 	}();
-	if (!anim::Disabled() || radialUpdated) {
+	if (!anim::Disabled() || updated) {
 		Auth().data().requestItemRepaint(parent());
 	}
 	if (!_radial->animating()) {
 		checkRadialFinished();
-		return false;
 	}
-	return true;
 }
 
 void RadialProgressItem::ensureRadial() {
 	if (!_radial) {
 		_radial = std::make_unique<Ui::RadialAnimation>([=](crl::time now) {
-			return radialAnimationCallback(now);
+			radialAnimationCallback(now);
 		});
 	}
 }
@@ -426,7 +424,7 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 		}
 	}
 	updateStatusText();
-	const auto radial = isRadialAnimation(context->ms);
+	const auto radial = isRadialAnimation();
 	const auto radialOpacity = radial ? _radial->opacity() : 0.;
 
 	if ((blurred || thumbLoaded || goodLoaded)
@@ -554,8 +552,6 @@ void Video::updateStatusText() {
 		statusSize = FileStatusSizeFailed;
 	} else if (_data->uploading()) {
 		statusSize = _data->uploadingData->offset;
-	} else if (_data->loading()) {
-		statusSize = _data->loadOffset();
 	} else if (_data->loaded()) {
 		statusSize = FileStatusSizeLoaded;
 	} else {
@@ -619,12 +615,12 @@ void Voice::paint(Painter &p, const QRect &clip, TextSelection selection, const
 			_radial->start(_data->progress());
 		}
 	}
-	bool showPause = updateStatusText();
+	const auto showPause = updateStatusText();
-	int32 nameVersion = parent()->fromOriginal()->nameVersion;
+	const auto nameVersion = parent()->fromOriginal()->nameVersion;
 	if (nameVersion > _nameVersion) {
 		updateName();
 	}
-	bool radial = isRadialAnimation(context->ms);
+	const auto radial = isRadialAnimation();
 
 	const auto nameleft = _st.songPadding.left()
 		+ _st.songThumbSize
@@ -915,12 +911,13 @@ void Document::initDimensions() {
 }
 
 void Document::paint(Painter &p, const QRect &clip, TextSelection selection, const PaintContext *context) {
-	bool selected = (selection == FullSelection);
+	const auto selected = (selection == FullSelection);
 
 	const auto cornerDownload = downloadInCorner();
 
 	_data->automaticLoad(parent()->fullId(), parent());
-	bool loaded = _data->loaded(), displayLoading = _data->displayLoading();
+	const auto loaded = _data->loaded();
+	const auto displayLoading = _data->displayLoading();
 
 	if (displayLoading) {
 		ensureRadial();
@@ -928,13 +925,13 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
 			_radial->start(_data->progress());
 		}
 	}
-	bool showPause = updateStatusText();
+	const auto showPause = updateStatusText();
-	bool radial = isRadialAnimation(context->ms);
+	const auto radial = isRadialAnimation();
 
 	int32 nameleft = 0, nametop = 0, nameright = 0, statustop = 0, datetop = -1;
-	bool wthumb = withThumb();
+	const auto wthumb = withThumb();
 
-	auto isSong = _data->isSong();
+	const auto isSong = _data->isSong();
 	if (isSong) {
 		nameleft = _st.songPadding.left() + _st.songThumbSize + _st.songPadding.right();
 		nameright = _st.songPadding.left();
@@ -1453,8 +1450,8 @@ void Link::initDimensions() {
 int32 Link::resizeGetHeight(int32 width) {
 	_width = qMin(width, _maxw);
 	int32 w = _width - st::linksPhotoSize - st::linksPhotoPadding;
-	for (int32 i = 0, l = _links.size(); i < l; ++i) {
+	for (const auto &link : _links) {
-		_links.at(i).lnk->setFullDisplayed(w >= _links.at(i).width);
+		link.lnk->setFullDisplayed(w >= link.width);
 	}
 
 	_height = 0;
@@ -1547,10 +1544,10 @@ void Link::paint(Painter &p, const QRect &clip, TextSelection selection, const P
 	}
 
 	p.setPen(st::windowActiveTextFg);
-	for (int32 i = 0, l = _links.size(); i < l; ++i) {
+	for (const auto &link : _links) {
-		if (clip.intersects(rtlrect(left, top, qMin(w, _links.at(i).width), st::normalFont->height, _width))) {
+		if (clip.intersects(rtlrect(left, top, qMin(w, link.width), st::normalFont->height, _width))) {
-			p.setFont(ClickHandler::showAsActive(_links.at(i).lnk) ? st::normalFont->underline() : st::normalFont);
+			p.setFont(ClickHandler::showAsActive(link.lnk) ? st::normalFont->underline() : st::normalFont);
-			p.drawTextLeft(left, top, _width, (w < _links.at(i).width) ? st::normalFont->elided(_links.at(i).text, w) : _links.at(i).text);
+			p.drawTextLeft(left, top, _width, (w < link.width) ? st::normalFont->elided(link.text, w) : link.text);
 		}
 		top += st::normalFont->height;
 	}
@@ -1587,9 +1584,9 @@ TextState Link::getState(
 	if (!_text.isEmpty()) {
 		top += qMin(st::normalFont->height * 3, _text.countHeight(w));
 	}
-	for (int32 i = 0, l = _links.size(); i < l; ++i) {
+	for (const auto &link : _links) {
-		if (rtlrect(left, top, qMin(w, _links.at(i).width), st::normalFont->height, _width).contains(point)) {
+		if (rtlrect(left, top, qMin(w, link.width), st::normalFont->height, _width).contains(point)) {
-			return { parent(), ClickHandlerPtr(_links[i].lnk) };
+			return { parent(), ClickHandlerPtr(link.lnk) };
 		}
 		top += st::normalFont->height;
 	}

Telegram/SourceFiles/overview/overview_layout.h

@@ -130,15 +130,19 @@ protected:
 		ClickHandlerPtr &&cancell);
 	void setDocumentLinks(not_null<DocumentData*> document);
 
-	bool radialAnimationCallback(crl::time now) const;
+	void radialAnimationCallback(crl::time now) const;
 
 	void ensureRadial();
 	void checkRadialFinished() const;
 
-	bool isRadialAnimation(crl::time now) const {
+	bool isRadialAnimation() const {
-		return _radial
+		if (_radial) {
-			&& _radial->animating()
+			if (_radial->animating()) {
-			&& radialAnimationCallback(now);
+				return true;
+			}
+			checkRadialFinished();
+		}
+		return false;
 	}
 
 	virtual float64 dataProgress() const = 0;