diff --git a/Telegram/SourceFiles/boxes/connection_box.cpp b/Telegram/SourceFiles/boxes/connection_box.cpp
index 7a8730d01..580d3b95b 100644
--- a/Telegram/SourceFiles/boxes/connection_box.cpp
+++ b/Telegram/SourceFiles/boxes/connection_box.cpp
@@ -253,7 +253,7 @@ void ProxyRow::updateFields(View &&view) {
 }
 
 void ProxyRow::step_radial(TimeMs ms, bool timer) {
-	if (timer) {
+	if (timer && !anim::Disabled()) {
 		update();
 	}
 }
@@ -375,13 +375,20 @@ void ProxyRow::paintCheck(Painter &p, TimeMs ms) {
 	p.setPen(pen);
 	p.setBrush(_st->bg);
 	const auto rect = rtlrect(QRectF(left, top, _st->diameter, _st->diameter).marginsRemoved(QMarginsF(_st->thickness / 2., _st->thickness / 2., _st->thickness / 2., _st->thickness / 2.)), outerWidth);
-	if (loading.arcLength < FullArcLength) {
+	if (_progress && loading.shown > 0 && anim::Disabled()) {
+		anim::DrawStaticLoading(
+			p,
+			rect,
+			_st->thickness,
+			pen.color(),
+			_st->bg);
+	} else if (loading.arcLength < FullArcLength) {
 		p.drawArc(rect, loading.arcFrom, loading.arcLength);
 	} else {
 		p.drawEllipse(rect);
 	}
 
-	if (toggled > 0) {
+	if (toggled > 0 && (!_progress || !anim::Disabled())) {
 		p.setPen(Qt::NoPen);
 		p.setBrush(anim::brush(_st->untoggledFg, _st->toggledFg, toggled * set));
 
diff --git a/Telegram/SourceFiles/boxes/local_storage_box.cpp b/Telegram/SourceFiles/boxes/local_storage_box.cpp
index 53442a7b4..be110cc61 100644
--- a/Telegram/SourceFiles/boxes/local_storage_box.cpp
+++ b/Telegram/SourceFiles/boxes/local_storage_box.cpp
@@ -186,7 +186,7 @@ void LocalStorageBox::Row::toggleProgress(bool shown) {
 }
 
 void LocalStorageBox::Row::step_radial(TimeMs ms, bool timer) {
-	if (timer) {
+	if (timer && !anim::Disabled()) {
 		RpWidget::update();
 	}
 }
diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp
index 23682ad9a..9f6846b77 100644
--- a/Telegram/SourceFiles/boxes/stickers_box.cpp
+++ b/Telegram/SourceFiles/boxes/stickers_box.cpp
@@ -1204,6 +1204,9 @@ void StickersBox::Inner::leaveToChildEvent(QEvent *e, QWidget *child) {
 }
 
 void StickersBox::Inner::step_shifting(TimeMs ms, bool timer) {
+	if (anim::Disabled()) {
+		ms += st::stickersRowDuration;
+	}
 	auto animating = false;
 	auto updateMin = -1;
 	auto updateMax = 0;
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index fe7337933..7d403b83b 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -653,6 +653,9 @@ void StickersListWidget::Footer::paintSetIcon(
 }
 
 void StickersListWidget::Footer::step_icons(TimeMs ms, bool timer) {
+	if (anim::Disabled()) {
+		ms += st::stickerIconMove;
+	}
 	if (_iconsStartAnim) {
 		auto dt = (ms - _iconsStartAnim) / float64(st::stickerIconMove);
 		if (dt >= 1) {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 47983d1e4..7f6c4e01a 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1000,6 +1000,10 @@ bool DialogsInner::updateReorderPinned(QPoint localPosition) {
 }
 
 void DialogsInner::step_pinnedShifting(TimeMs ms, bool timer) {
+	if (anim::Disabled()) {
+		ms += st::stickersRowDuration;
+	}
+
 	auto animating = false;
 	auto updateMin = -1;
 	auto updateMax = 0;
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 9d30a999b..8891ef251 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -632,7 +632,7 @@ bool History::updateSendActionNeedsAnimating(TimeMs ms, bool force) {
 		}
 	}
 	auto result = (!_typing.isEmpty() || !_sendActions.isEmpty());
-	if (changed || result) {
+	if (changed || (result && !anim::Disabled())) {
 		App::histories().sendActionAnimationUpdated().notify({
 			this,
 			_sendActionAnimation.width(),
diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index ec00713b9..207be8c64 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -616,6 +616,9 @@ void ReplyKeyboard::startAnimation(int i, int j, int direction) {
 }
 
 void ReplyKeyboard::step_selected(TimeMs ms, bool timer) {
+	if (anim::Disabled()) {
+		ms += st::botKbDuration;
+	}
 	for (auto i = _animations.begin(); i != _animations.end();) {
 		const auto index = std::abs(i->first) - 1;
 		const auto row = (index / MatrixRowShift);
diff --git a/Telegram/SourceFiles/history/history_media_types.cpp b/Telegram/SourceFiles/history/history_media_types.cpp
index f7cec2a12..eb3129317 100644
--- a/Telegram/SourceFiles/history/history_media_types.cpp
+++ b/Telegram/SourceFiles/history/history_media_types.cpp
@@ -205,10 +205,18 @@ void HistoryFileMedia::setStatusSize(int newSize, int fullSize, int duration, qi
 }
 
 void HistoryFileMedia::step_radial(TimeMs ms, bool timer) {
+	const auto updateRadial = [&] {
+		return _animation->radial.update(
+			dataProgress(),
+			dataFinished(),
+			ms);
+	};
 	if (timer) {
-		Auth().data().requestViewRepaint(_parent);
+		if (!anim::Disabled() || updateRadial()) {
+			Auth().data().requestViewRepaint(_parent);
+		}
 	} else {
-		_animation->radial.update(dataProgress(), dataFinished(), ms);
+		updateRadial();
 		if (!_animation->radial.animating()) {
 			checkAnimationFinished();
 		}
@@ -1848,6 +1856,9 @@ QMargins HistoryDocument::bubbleMargins() const {
 }
 
 void HistoryDocument::step_voiceProgress(float64 ms, bool timer) {
+	if (anim::Disabled()) {
+		ms += (2 * AudioVoiceMsgUpdateView);
+	}
 	if (auto voice = Get<HistoryDocumentVoice>()) {
 		if (voice->_playback) {
 			float64 dt = ms / (2 * AudioVoiceMsgUpdateView);
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 187b39968..23e610e26 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -2917,7 +2917,7 @@ void HistoryWidget::saveEditMsg() {
 
 	const auto textWithTags = _field->getTextWithAppliedMarkdown();
 	const auto prepareFlags = Ui::ItemTextOptions(
-		_history, 
+		_history,
 		Auth().user()).flags;
 	auto sending = TextWithEntities();
 	auto left = TextWithEntities { textWithTags.text, ConvertTextTagsToEntities(textWithTags.tags) };
@@ -3232,14 +3232,16 @@ void HistoryWidget::unreadMentionsAnimationFinish() {
 }
 
 void HistoryWidget::step_recording(float64 ms, bool timer) {
-	float64 dt = ms / AudioVoiceMsgUpdateView;
+	const auto dt = anim::Disabled() ? 1. : (ms / AudioVoiceMsgUpdateView);
 	if (dt >= 1) {
 		_a_recording.stop();
 		a_recordingLevel.finish();
 	} else {
 		a_recordingLevel.update(dt, anim::linear);
 	}
-	if (timer) update(_attachToggle->geometry());
+	if (timer && !anim::Disabled()) {
+		update(_attachToggle->geometry());
+	}
 }
 
 void HistoryWidget::chooseAttach() {
diff --git a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
index a765c6311..2f922edc7 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -152,7 +152,7 @@ void TopBarWidget::updateConnectingState() {
 }
 
 void TopBarWidget::step_connecting(TimeMs ms, bool timer) {
-	if (timer) {
+	if (timer && !anim::Disabled()) {
 		update();
 	}
 }
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
index 4eb8d529a..0d8b262ac 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
@@ -326,11 +326,19 @@ bool Gif::isRadialAnimation(TimeMs ms) const {
 }
 
 void Gif::step_radial(TimeMs ms, bool timer) {
+	const auto document = getShownDocument();
+	const auto updateRadial = [&] {
+		return _animation->radial.update(
+			document->progress(),
+			!document->loading() || document->loaded(),
+			ms);
+	};
 	if (timer) {
-		update();
+		if (!anim::Disabled() || updateRadial()) {
+			update();
+		}
 	} else {
-		DocumentData *document = getShownDocument();
-		_animation->radial.update(document->progress(), !document->loading() || document->loaded(), ms);
+		updateRadial();
 		if (!_animation->radial.animating() && document->loaded()) {
 			_animation.reset();
 		}
@@ -819,13 +827,18 @@ void File::thumbAnimationCallback() {
 }
 
 void File::step_radial(TimeMs ms, bool timer) {
-	if (timer) {
-		update();
-	} else {
-		_animation->radial.update(
+	const auto updateRadial = [&] {
+		return _animation->radial.update(
 			_document->progress(),
 			!_document->loading() || _document->loaded(),
 			ms);
+	};
+	if (timer) {
+		if (!anim::Disabled() || updateRadial()) {
+			update();
+		}
+	} else {
+		updateRadial();
 		if (!_animation->radial.animating()) {
 			checkAnimationFinished();
 		}
@@ -1333,11 +1346,19 @@ bool Game::isRadialAnimation(TimeMs ms) const {
 }
 
 void Game::step_radial(TimeMs ms, bool timer) {
+	const auto document = getResultDocument();
+	const auto updateRadial = [&] {
+		return _radial->update(
+			document->progress(),
+			!document->loading() || document->loaded(),
+			ms);
+	};
 	if (timer) {
-		update();
+		if (!anim::Disabled() || updateRadial()) {
+			update();
+		}
 	} else {
-		auto document = getResultDocument();
-		_radial->update(document->progress(), !document->loading() || document->loaded(), ms);
+		updateRadial();
 		if (!_radial->animating() && document->loaded()) {
 			_radial.reset();
 		}
diff --git a/Telegram/SourceFiles/media/view/media_clip_playback.cpp b/Telegram/SourceFiles/media/view/media_clip_playback.cpp
index d39309fb6..7fbcdb557 100644
--- a/Telegram/SourceFiles/media/view/media_clip_playback.cpp
+++ b/Telegram/SourceFiles/media/view/media_clip_playback.cpp
@@ -94,7 +94,7 @@ void Playback::setValue(float64 value, bool animated) {
 }
 
 void Playback::step_value(float64 ms, bool timer) {
-	auto dt = ms / kPlaybackAnimationDurationMs;
+	auto dt = anim::Disabled() ? 1. : (ms / kPlaybackAnimationDurationMs);
 	if (dt >= 1.) {
 		_a_value.stop();
 		a_value.finish();
diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp
index 6712d25d0..398060357 100644
--- a/Telegram/SourceFiles/mediaview.cpp
+++ b/Telegram/SourceFiles/mediaview.cpp
@@ -480,8 +480,11 @@ auto MediaView::computeOverviewType() const
 }
 
 void MediaView::step_state(TimeMs ms, bool timer) {
+	if (anim::Disabled()) {
+		ms += st::mediaviewShowDuration + st::mediaviewHideDuration;
+	}
 	bool result = false;
-	for (Showing::iterator i = _animations.begin(); i != _animations.end();) {
+	for (auto i = _animations.begin(); i != _animations.end();) {
 		TimeMs start = i.value();
 		switch (i.key()) {
 		case OverLeftNav: update(_leftNav); break;
@@ -584,8 +587,11 @@ void MediaView::step_radial(TimeMs ms, bool timer) {
 		return;
 	}
 	const auto wasAnimating = _radial.animating();
-	_radial.update(radialProgress(), !radialLoading(), ms + radialTimeShift());
-	if (timer && (wasAnimating || _radial.animating())) {
+	const auto updated = _radial.update(
+		radialProgress(), 
+		!radialLoading(), 
+		ms + radialTimeShift());
+	if (timer && (wasAnimating || _radial.animating()) && (!anim::Disabled() || updated)) {
 		update(radialRect());
 	}
 	const auto ready = _doc && _doc->loaded();
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index 795f3309f..39bb4a79b 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -227,10 +227,15 @@ void RadialProgressItem::setLinks(ClickHandlerPtr &&openl, ClickHandlerPtr &&sav
 }
 
 void RadialProgressItem::step_radial(TimeMs ms, bool timer) {
+	const auto updateRadial = [&] {
+		return _radial->update(dataProgress(), dataFinished(), ms);
+	};
 	if (timer) {
-		Auth().data().requestItemRepaint(parent());
+		if (!anim::Disabled() || updateRadial()) {
+			Auth().data().requestItemRepaint(parent());
+		}
 	} else {
-		_radial->update(dataProgress(), dataFinished(), ms);
+		updateRadial();
 		if (!_radial->animating()) {
 			checkRadialFinished();
 		}
diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp
index e8caeb1b6..2f9a524a4 100644
--- a/Telegram/SourceFiles/settings/settings_chat.cpp
+++ b/Telegram/SourceFiles/settings/settings_chat.cpp
@@ -203,11 +203,11 @@ TimeMs BackgroundRow::radialTimeShift() const {
 }
 
 void BackgroundRow::step_radial(TimeMs ms, bool timer) {
-	_radial.update(
+	const auto updated = _radial.update(
 		radialProgress(),
 		!radialLoading(),
 		ms + radialTimeShift());
-	if (timer && _radial.animating()) {
+	if (timer && _radial.animating() && (!anim::Disabled() || updated)) {
 		rtlupdate(radialRect());
 	}
 }
diff --git a/Telegram/SourceFiles/ui/animation.cpp b/Telegram/SourceFiles/ui/animation.cpp
index b1d2775fe..5f196fa75 100644
--- a/Telegram/SourceFiles/ui/animation.cpp
+++ b/Telegram/SourceFiles/ui/animation.cpp
@@ -93,8 +93,10 @@ void stopManager() {
 	Media::Clip::Finish();
 }
 
-void registerClipManager(Media::Clip::Manager *manager) {
-	manager->connect(manager, SIGNAL(callback(Media::Clip::Reader*,qint32,qint32)), _manager, SLOT(clipCallback(Media::Clip::Reader*,qint32,qint32)));
+void registerClipManager(not_null<Media::Clip::Manager*> manager) {
+	Expects(_manager != nullptr);
+
+	_manager->registerClip(manager);
 }
 
 bool Disabled() {
@@ -104,7 +106,35 @@ bool Disabled() {
 void SetDisabled(bool disabled) {
 	AnimationsDisabled = disabled;
 	if (disabled && _manager) {
-		_manager->timeout();
+		_manager->step();
+	}
+}
+
+void DrawStaticLoading(
+		QPainter &p,
+		QRectF rect,
+		int stroke,
+		QPen pen,
+		QBrush brush) {
+	PainterHighQualityEnabler hq(p);
+
+	p.setBrush(brush);
+	pen.setWidthF(stroke);
+	pen.setCapStyle(Qt::RoundCap);
+	pen.setJoinStyle(Qt::RoundJoin);
+	p.setPen(pen);
+	p.drawEllipse(rect);
+
+	const auto center = rect.center();
+	const auto first = QPointF(center.x(), rect.y() + 1.5 * stroke);
+	const auto delta = center.y() - first.y();
+	const auto second = QPointF(center.x() + delta * 2 / 3., center.y());
+	if (delta > 0) {
+		QPainterPath path;
+		path.moveTo(first);
+		path.lineTo(center);
+		path.lineTo(second);
+		p.drawPath(path);
 	}
 }
 
@@ -125,19 +155,19 @@ void BasicAnimation::stop() {
 	_manager->stop(this);
 }
 
-AnimationManager::AnimationManager() : _timer(this), _iterating(false) {
+AnimationManager::AnimationManager() : _timer(this) {
 	_timer.setSingleShot(false);
-	connect(&_timer, SIGNAL(timeout()), this, SLOT(timeout()));
+	connect(&_timer, &QTimer::timeout, this, &AnimationManager::step);
 }
 
 void AnimationManager::start(BasicAnimation *obj) {
 	if (_iterating) {
 		_starting.insert(obj);
-		if (!_stopping.isEmpty()) {
-			_stopping.remove(obj);
+		if (!_stopping.empty()) {
+			_stopping.erase(obj);
 		}
 	} else {
-		if (_objects.isEmpty()) {
+		if (_objects.empty()) {
 			_timer.start(AnimationTimerDelta);
 		}
 		_objects.insert(obj);
@@ -147,8 +177,8 @@ void AnimationManager::start(BasicAnimation *obj) {
 void AnimationManager::stop(BasicAnimation *obj) {
 	if (_iterating) {
 		_stopping.insert(obj);
-		if (!_starting.isEmpty()) {
-			_starting.remove(obj);
+		if (!_starting.empty()) {
+			_starting.erase(obj);
 		}
 	} else {
 		auto i = _objects.find(obj);
@@ -161,25 +191,33 @@ void AnimationManager::stop(BasicAnimation *obj) {
 	}
 }
 
-void AnimationManager::timeout() {
+void AnimationManager::registerClip(not_null<Media::Clip::Manager*> clip) {
+	connect(
+		clip,
+		&Media::Clip::Manager::callback,
+		this,
+		&AnimationManager::clipCallback);
+}
+
+void AnimationManager::step() {
 	_iterating = true;
-	auto ms = getms();
-	for_const (auto object, _objects) {
+	const auto ms = getms();
+	for (const auto object : _objects) {
 		if (!_stopping.contains(object)) {
 			object->step(ms, true);
 		}
 	}
 	_iterating = false;
 
-	if (!_starting.isEmpty()) {
-		for_const (auto object, _starting) {
-			_objects.insert(object);
+	if (!_starting.empty()) {
+		for (const auto object : _starting) {
+			_objects.emplace(object);
 		}
 		_starting.clear();
 	}
-	if (!_stopping.isEmpty()) {
-		for_const (auto object, _stopping) {
-			_objects.remove(object);
+	if (!_stopping.empty()) {
+		for (const auto object : _stopping) {
+			_objects.erase(object);
 		}
 		_stopping.clear();
 	}
@@ -188,7 +226,13 @@ void AnimationManager::timeout() {
 	}
 }
 
-void AnimationManager::clipCallback(Media::Clip::Reader *reader, qint32 threadIndex, qint32 notification) {
-	Media::Clip::Reader::callback(reader, threadIndex, Media::Clip::Notification(notification));
+void AnimationManager::clipCallback(
+		Media::Clip::Reader *reader,
+		qint32 threadIndex,
+		qint32 notification) {
+	Media::Clip::Reader::callback(
+		reader,
+		threadIndex,
+		Media::Clip::Notification(notification));
 }
 
diff --git a/Telegram/SourceFiles/ui/animation.h b/Telegram/SourceFiles/ui/animation.h
index fb2e0be23..470e67506 100644
--- a/Telegram/SourceFiles/ui/animation.h
+++ b/Telegram/SourceFiles/ui/animation.h
@@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtCore/QTimer>
 #include <QtGui/QColor>
+#include "base/binary_guard.h"
+#include "base/flat_set.h"
 
 namespace Media {
 namespace Clip {
@@ -161,7 +163,7 @@ private:
 
 void startManager();
 void stopManager();
-void registerClipManager(Media::Clip::Manager *manager);
+void registerClipManager(not_null<Media::Clip::Manager*> manager);
 
 TG_FORCE_INLINE int interpolate(int a, int b, float64 b_ratio) {
 	return qRound(a + float64(b - a) * b_ratio);
@@ -416,6 +418,13 @@ QPainterPath path(QPointF (&from)[N]) {
 bool Disabled();
 void SetDisabled(bool disabled);
 
+void DrawStaticLoading(
+	QPainter &p,
+	QRectF rect,
+	int stroke,
+	QPen pen,
+	QBrush brush = Qt::NoBrush);
+
 };
 
 class BasicAnimation;
@@ -662,12 +671,14 @@ private:
 	struct Data {
 		template <typename Lambda>
 		Data(float64 from, Lambda updateCallback)
-			: value(from, from)
-			, a_animation(animation(this, &Data::step))
-			, updateCallback(std::move(updateCallback)) {
+		: value(from, from)
+		, a_animation(animation(this, &Data::step))
+		, updateCallback(std::move(updateCallback)) {
 		}
 		void step(float64 ms, bool timer) {
-			auto dt = (ms >= duration || anim::Disabled()) ? 1. : (ms / duration);
+			const auto dt = (ms >= duration || anim::Disabled())
+				? 1.
+				: (ms / duration);
 			if (dt >= 1) {
 				value.finish();
 				a_animation.stop();
@@ -690,23 +701,23 @@ private:
 };
 
 class AnimationManager : public QObject {
-	Q_OBJECT
-
 public:
 	AnimationManager();
 
 	void start(BasicAnimation *obj);
 	void stop(BasicAnimation *obj);
 
-public slots:
-	void timeout();
-
-	void clipCallback(Media::Clip::Reader *reader, qint32 threadIndex, qint32 notification);
+	void registerClip(not_null<Media::Clip::Manager*> clip);
+	void step();
 
 private:
-	using AnimatingObjects = OrderedSet<BasicAnimation*>;
-	AnimatingObjects _objects, _starting, _stopping;
+	void clipCallback(
+		Media::Clip::Reader *reader,
+		qint32 threadIndex,
+		qint32 notification);
+
+	base::flat_set<BasicAnimation*> _objects, _starting, _stopping;
 	QTimer _timer;
-	bool _iterating;
+	bool _iterating = false;
 
 };
diff --git a/Telegram/SourceFiles/ui/effects/cross_animation.cpp b/Telegram/SourceFiles/ui/effects/cross_animation.cpp
index 2f2e25558..f8ef91527 100644
--- a/Telegram/SourceFiles/ui/effects/cross_animation.cpp
+++ b/Telegram/SourceFiles/ui/effects/cross_animation.cpp
@@ -11,6 +11,7 @@ namespace Ui {
 namespace {
 
 constexpr auto kPointCount = 12;
+constexpr auto kStaticLoadingValue = float64(-666);
 
 //
 //     1         3
@@ -90,7 +91,26 @@ void transformLoadingCross(float64 loading, std::array<QPointF, kPointCount> &po
 
 } // namespace
 
-void CrossAnimation::paint(Painter &p, const style::CrossAnimation &st, style::color color, int x, int y, int outerWidth, float64 shown, float64 loading) {
+void CrossAnimation::paintStaticLoading(
+		Painter &p,
+		const style::CrossAnimation &st,
+		style::color color,
+		int x,
+		int y,
+		int outerWidth,
+		float64 shown) {
+	paint(p, st, color, x, y, outerWidth, shown, kStaticLoadingValue);
+}
+
+void CrossAnimation::paint(
+		Painter &p,
+		const style::CrossAnimation &st,
+		style::color color,
+		int x,
+		int y,
+		int outerWidth,
+		float64 shown,
+		float64 loading) {
 	PainterHighQualityEnabler hq(p);
 
 	auto sqrt2 = sqrt(2.);
@@ -117,7 +137,8 @@ void CrossAnimation::paint(Painter &p, const style::CrossAnimation &st, style::c
 	} };
 	auto pathDeleteSize = kPointCount;
 
-	auto loadingArcLength = 0;
+	const auto staticLoading = (loading == kStaticLoadingValue);
+	auto loadingArcLength = staticLoading ? FullArcLength : 0;
 	if (loading > 0.) {
 		transformLoadingCross(loading, pathDelete, pathDeleteSize);
 
@@ -125,44 +146,50 @@ void CrossAnimation::paint(Painter &p, const style::CrossAnimation &st, style::c
 		loadingArcLength = qRound(-loadingArc * 2 * FullArcLength);
 	}
 
-	if (shown < 1.) {
-		auto alpha = -(shown - 1.) * M_PI_2;
-		auto cosalpha = cos(alpha);
-		auto sinalpha = sin(alpha);
-		auto shiftx = deleteLeft + (deleteWidth / 2.);
-		auto shifty = deleteTop + (deleteHeight / 2.);
-		for (auto &point : pathDelete) {
-			auto x = point.x() - shiftx;
-			auto y = point.y() - shifty;
-			point.setX(shiftx + x * cosalpha - y * sinalpha);
-			point.setY(shifty + y * cosalpha + x * sinalpha);
+	if (!staticLoading) {
+		if (shown < 1.) {
+			auto alpha = -(shown - 1.) * M_PI_2;
+			auto cosalpha = cos(alpha);
+			auto sinalpha = sin(alpha);
+			auto shiftx = deleteLeft + (deleteWidth / 2.);
+			auto shifty = deleteTop + (deleteHeight / 2.);
+			for (auto &point : pathDelete) {
+				auto x = point.x() - shiftx;
+				auto y = point.y() - shifty;
+				point.setX(shiftx + x * cosalpha - y * sinalpha);
+				point.setY(shifty + y * cosalpha + x * sinalpha);
+			}
 		}
+		QPainterPath path;
+		path.moveTo(pathDelete[0]);
+		for (int i = 1; i != pathDeleteSize; ++i) {
+			path.lineTo(pathDelete[i]);
+		}
+		path.lineTo(pathDelete[0]);
+		p.fillPath(path, color);
 	}
-	QPainterPath path;
-	path.moveTo(pathDelete[0]);
-	for (int i = 1; i != pathDeleteSize; ++i) {
-		path.lineTo(pathDelete[i]);
-	}
-	path.lineTo(pathDelete[0]);
-	p.fillPath(path, color);
-
 	if (loadingArcLength != 0) {
-		auto loadingArcStart = FullArcLength / 8;
 		auto roundSkip = (st.size * (1 - sqrt2) + 2 * sqrt2 * deleteSkip + st.stroke) / 2;
 		auto roundPart = QRectF(x + roundSkip, y + roundSkip, st.size - 2 * roundSkip, st.size - 2 * roundSkip);
-		if (shown < 1.) {
-			loadingArcStart -= qRound(-(shown - 1.) * FullArcLength / 4.);
+		if (staticLoading) {
+			anim::DrawStaticLoading(p, roundPart, st.stroke, color);
+		} else {
+			auto loadingArcStart = FullArcLength / 8;
+			if (shown < 1.) {
+				loadingArcStart -= qRound(-(shown - 1.) * FullArcLength / 4.);
+			}
+			if (loadingArcLength < 0) {
+				loadingArcStart += loadingArcLength;
+				loadingArcLength = -loadingArcLength;
+			}
+
+			p.setBrush(Qt::NoBrush);
+			auto pen = color->p;
+			pen.setWidthF(st.stroke);
+			pen.setCapStyle(Qt::RoundCap);
+			p.setPen(pen);
+			p.drawArc(roundPart, loadingArcStart, loadingArcLength);
 		}
-		p.setBrush(Qt::NoBrush);
-		auto pen = color->p;
-		pen.setWidthF(st.stroke);
-		pen.setCapStyle(Qt::RoundCap);
-		p.setPen(pen);
-		if (loadingArcLength < 0) {
-			loadingArcStart += loadingArcLength;
-			loadingArcLength = -loadingArcLength;
-		}
-		p.drawArc(roundPart, loadingArcStart, loadingArcLength);
 	}
 }
 
diff --git a/Telegram/SourceFiles/ui/effects/cross_animation.h b/Telegram/SourceFiles/ui/effects/cross_animation.h
index 5f9ba8203..3492a7646 100644
--- a/Telegram/SourceFiles/ui/effects/cross_animation.h
+++ b/Telegram/SourceFiles/ui/effects/cross_animation.h
@@ -13,7 +13,23 @@ namespace Ui {
 
 class CrossAnimation {
 public:
-	static void paint(Painter &p, const style::CrossAnimation &st, style::color color, int x, int y, int outerWidth, float64 shown, float64 loading = 0.);
+	static void paint(
+		Painter &p,
+		const style::CrossAnimation &st,
+		style::color color,
+		int x,
+		int y,
+		int outerWidth,
+		float64 shown,
+		float64 loading = 0.);
+	static void paintStaticLoading(
+		Painter &p,
+		const style::CrossAnimation &st,
+		style::color color,
+		int x,
+		int y,
+		int outerWidth,
+		float64 shown);
 
 };
 
diff --git a/Telegram/SourceFiles/ui/effects/radial_animation.cpp b/Telegram/SourceFiles/ui/effects/radial_animation.cpp
index 559860214..35b1b440e 100644
--- a/Telegram/SourceFiles/ui/effects/radial_animation.cpp
+++ b/Telegram/SourceFiles/ui/effects/radial_animation.cpp
@@ -23,9 +23,10 @@ void RadialAnimation::start(float64 prg) {
 	_animation.start();
 }
 
-void RadialAnimation::update(float64 prg, bool finished, TimeMs ms) {
-	auto iprg = qRound(qMax(prg, 0.0001) * AlmostFullArcLength);
-	if (iprg != qRound(a_arcEnd.to())) {
+bool RadialAnimation::update(float64 prg, bool finished, TimeMs ms) {
+	const auto iprg = qRound(qMax(prg, 0.0001) * AlmostFullArcLength);
+	const auto result = (iprg != qRound(a_arcEnd.to()));
+	if (result) {
 		a_arcEnd.start(iprg);
 		_lastStart = _lastTime;
 	}
@@ -34,7 +35,12 @@ void RadialAnimation::update(float64 prg, bool finished, TimeMs ms) {
 	auto dt = float64(ms - _lastStart);
 	auto fulldt = float64(ms - _firstStart);
 	_opacity = qMin(fulldt / st::radialDuration, 1.);
-	if (!finished) {
+	if (anim::Disabled()) {
+		a_arcEnd.update(1., anim::linear);
+		if (finished) {
+			stop();
+		}
+	} else if (!finished) {
 		a_arcEnd.update(1. - (st::radialDuration / (st::radialDuration + dt)), anim::linear);
 	} else if (dt >= st::radialDuration) {
 		a_arcEnd.update(1., anim::linear);
@@ -46,6 +52,7 @@ void RadialAnimation::update(float64 prg, bool finished, TimeMs ms) {
 	}
 	auto fromstart = fulldt / st::radialPeriod;
 	a_arcStart.update(fromstart - std::floor(fromstart), anim::linear);
+	return result;
 }
 
 void RadialAnimation::stop() {
@@ -69,7 +76,9 @@ void RadialAnimation::draw(Painter &p, const QRect &inner, int32 thickness, styl
 	p.setPen(pen);
 
 	auto len = MinArcLength + qRound(a_arcEnd.current());
-	auto from = QuarterArcLength - qRound(a_arcStart.current()) - len;
+	auto from = QuarterArcLength
+		- len
+		- (anim::Disabled() ? 0 : qRound(a_arcStart.current()));
 	if (rtl()) {
 		from = QuarterArcLength - (from - QuarterArcLength) - len;
 		if (from < 0) from += FullArcLength;
@@ -104,6 +113,9 @@ void InfiniteRadialAnimation::start() {
 
 void InfiniteRadialAnimation::stop() {
 	const auto now = getms();
+	if (anim::Disabled()) {
+		_workFinished = now;
+	}
 	if (!_workFinished) {
 		const auto zero = _workStarted - _st.sineDuration;
 		const auto index = (now - zero + _st.sinePeriod - _st.sineShift)
@@ -138,26 +150,32 @@ void InfiniteRadialAnimation::draw(
 	auto o = p.opacity();
 	p.setOpacity(o * state.shown);
 
-	auto pen = _st.color->p;
-	auto was = p.pen();
-	pen.setWidth(_st.thickness);
-	pen.setCapStyle(Qt::RoundCap);
-	p.setPen(pen);
+	const auto rect = rtlrect(
+		position.x(),
+		position.y(),
+		size.width(),
+		size.height(),
+		outerWidth);
+	const auto was = p.pen();
+	const auto brush = p.brush();
+	if (anim::Disabled()) {
+		anim::DrawStaticLoading(p, rect, _st.thickness, _st.color);
+	} else {
+		auto pen = _st.color->p;
+		pen.setWidth(_st.thickness);
+		pen.setCapStyle(Qt::RoundCap);
+		p.setPen(pen);
 
-	{
-		PainterHighQualityEnabler hq(p);
-		p.drawArc(
-			rtlrect(
-				position.x(),
-				position.y(),
-				size.width(),
-				size.height(),
-				outerWidth),
-			state.arcFrom,
-			state.arcLength);
+		{
+			PainterHighQualityEnabler hq(p);
+			p.drawArc(
+				rect,
+				state.arcFrom,
+				state.arcLength);
+		}
 	}
-
 	p.setPen(was);
+	p.setBrush(brush);
 	p.setOpacity(o);
 }
 
@@ -173,6 +191,10 @@ auto InfiniteRadialAnimation::computeState() -> State {
 			linear,
 			FullArcLength };
 	}
+	if (anim::Disabled()) {
+		const auto shown = 1.;
+		return { 1., 0, FullArcLength };
+	}
 	const auto min = int(std::round(FullArcLength * _st.arcMin));
 	const auto max = int(std::round(FullArcLength * _st.arcMax));
 	if (now <= _workStarted) {
diff --git a/Telegram/SourceFiles/ui/effects/radial_animation.h b/Telegram/SourceFiles/ui/effects/radial_animation.h
index bc28c5a7f..e0a6aabc7 100644
--- a/Telegram/SourceFiles/ui/effects/radial_animation.h
+++ b/Telegram/SourceFiles/ui/effects/radial_animation.h
@@ -25,7 +25,7 @@ public:
 	}
 
 	void start(float64 prg);
-	void update(float64 prg, bool finished, TimeMs ms);
+	bool update(float64 prg, bool finished, TimeMs ms);
 	void stop();
 
 	void step(TimeMs ms);
diff --git a/Telegram/SourceFiles/ui/effects/send_action_animations.cpp b/Telegram/SourceFiles/ui/effects/send_action_animations.cpp
index 9eae7a536..d40537d00 100644
--- a/Telegram/SourceFiles/ui/effects/send_action_animations.cpp
+++ b/Telegram/SourceFiles/ui/effects/send_action_animations.cpp
@@ -190,6 +190,23 @@ bool SendActionAnimation::Impl::supports(Type type) const {
 	return Implementations->value(type, &TypingAnimation::kMeta) == metaData();
 }
 
+void SendActionAnimation::Impl::paint(
+		Painter &p,
+		style::color color,
+		int x,
+		int y,
+		int outerWidth,
+		TimeMs ms) {
+	paintFrame(
+		p,
+		color,
+		x,
+		y,
+		outerWidth,
+		anim::Disabled() ? 0 : (qMax(ms - _started, 0LL) % _period));
+}
+
+
 void SendActionAnimation::start(Type type) {
 	if (!_impl || !_impl->supports(type)) {
 		_impl = createByType(type);
diff --git a/Telegram/SourceFiles/ui/effects/send_action_animations.h b/Telegram/SourceFiles/ui/effects/send_action_animations.h
index 14391555d..7f6b298dd 100644
--- a/Telegram/SourceFiles/ui/effects/send_action_animations.h
+++ b/Telegram/SourceFiles/ui/effects/send_action_animations.h
@@ -44,9 +44,13 @@ public:
 		bool supports(Type type) const;
 
 		virtual int width() const = 0;
-		void paint(Painter &p, style::color color, int x, int y, int outerWidth, TimeMs ms) {
-			paintFrame(p, color, x, y, outerWidth, qMax(ms - _started, 0LL) % _period);
-		}
+		void paint(
+			Painter &p,
+			style::color color,
+			int x,
+			int y,
+			int outerWidth,
+			TimeMs ms);
 
 		virtual ~Impl() = default;
 
diff --git a/Telegram/SourceFiles/ui/special_buttons.cpp b/Telegram/SourceFiles/ui/special_buttons.cpp
index b217dbcf4..6ec7b063e 100644
--- a/Telegram/SourceFiles/ui/special_buttons.cpp
+++ b/Telegram/SourceFiles/ui/special_buttons.cpp
@@ -182,28 +182,50 @@ void EmojiButton::paintEvent(QPaintEvent *e) {
 	p.fillRect(e->rect(), st::historyComposeAreaBg);
 	paintRipple(p, _st.rippleAreaPosition.x(), _st.rippleAreaPosition.y(), ms, _rippleOverride ? &(*_rippleOverride)->c : nullptr);
 
+	const auto over = isOver();
 	const auto loadingState = _loading
 		? _loading->computeState()
 		: Ui::InfiniteRadialAnimation::State{ 0., 0, FullArcLength };
-	p.setOpacity(1. - loadingState.shown);
+	if (loadingState.shown < 1.) {
+		p.setOpacity(1. - loadingState.shown);
 
-	auto over = isOver();
-	auto icon = _iconOverride ? _iconOverride : &(over ? _st.iconOver : _st.icon);
-	icon->paint(p, _st.iconPosition, width());
+		auto icon = _iconOverride ? _iconOverride : &(over ? _st.iconOver : _st.icon);
+		icon->paint(p, _st.iconPosition, width());
 
-	p.setOpacity(1.);
-	auto pen = _colorOverride ? (*_colorOverride)->p : (over ? st::historyEmojiCircleFgOver : st::historyEmojiCircleFg)->p;
-	pen.setWidth(st::historyEmojiCircleLine);
-	pen.setCapStyle(Qt::RoundCap);
-	p.setPen(pen);
-	p.setBrush(Qt::NoBrush);
+		p.setOpacity(1.);
+	}
 
-	PainterHighQualityEnabler hq(p);
 	QRect inner(QPoint((width() - st::historyEmojiCircle.width()) / 2, st::historyEmojiCircleTop), st::historyEmojiCircle);
-	if (loadingState.arcLength < FullArcLength) {
-		p.drawArc(inner, loadingState.arcFrom, loadingState.arcLength);
+	const auto color = (_colorOverride
+		? *_colorOverride
+		: (over
+			? st::historyEmojiCircleFgOver
+			: st::historyEmojiCircleFg));
+	if (_loading && anim::Disabled()) {
+		anim::DrawStaticLoading(
+			p,
+			inner,
+			st::historyEmojiCircleLine,
+			color);
 	} else {
-		p.drawEllipse(inner);
+		auto pen = color->p;
+		pen.setWidth(st::historyEmojiCircleLine);
+		pen.setCapStyle(Qt::RoundCap);
+		p.setPen(pen);
+		p.setBrush(Qt::NoBrush);
+
+		PainterHighQualityEnabler hq(p);
+		if (loadingState.arcLength < FullArcLength) {
+			p.drawArc(inner, loadingState.arcFrom, loadingState.arcLength);
+		} else {
+			p.drawEllipse(inner);
+		}
+	}
+}
+
+void EmojiButton::step_loading(TimeMs ms, bool timer) {
+	if (timer && !anim::Disabled()) {
+		update();
 	}
 }
 
@@ -215,8 +237,10 @@ void EmojiButton::setLoading(bool loading) {
 	}
 	if (loading) {
 		_loading->start();
+		update();
 	} else if (_loading) {
 		_loading->stop();
+		update();
 	}
 }
 
diff --git a/Telegram/SourceFiles/ui/special_buttons.h b/Telegram/SourceFiles/ui/special_buttons.h
index 5d02454b7..0a4b3c3e6 100644
--- a/Telegram/SourceFiles/ui/special_buttons.h
+++ b/Telegram/SourceFiles/ui/special_buttons.h
@@ -65,11 +65,7 @@ protected:
 	QPoint prepareRippleStartPosition() const override;
 
 private:
-	void step_loading(TimeMs ms, bool timer) {
-		if (timer) {
-			update();
-		}
-	}
+	void step_loading(TimeMs ms, bool timer);
 
 	const style::IconButton &_st;
 
diff --git a/Telegram/SourceFiles/ui/twidget.h b/Telegram/SourceFiles/ui/twidget.h
index f946ba7e7..bf52b63ee 100644
--- a/Telegram/SourceFiles/ui/twidget.h
+++ b/Telegram/SourceFiles/ui/twidget.h
@@ -179,7 +179,7 @@ private:
 
 class PainterHighQualityEnabler {
 public:
-	PainterHighQualityEnabler(Painter &p) : _painter(p) {
+	PainterHighQualityEnabler(QPainter &p) : _painter(p) {
 		static constexpr QPainter::RenderHint Hints[] = {
 			QPainter::Antialiasing,
 			QPainter::SmoothPixmapTransform,
@@ -187,8 +187,8 @@ public:
 			QPainter::HighQualityAntialiasing
 		};
 
-		auto hints = _painter.renderHints();
-		for_const (auto hint, Hints) {
+		const auto hints = _painter.renderHints();
+		for (const auto hint : Hints) {
 			if (!(hints & hint)) {
 				_hints |= hint;
 			}
@@ -197,8 +197,12 @@ public:
 			_painter.setRenderHints(_hints);
 		}
 	}
-	PainterHighQualityEnabler(const PainterHighQualityEnabler &other) = delete;
-	PainterHighQualityEnabler &operator=(const PainterHighQualityEnabler &other) = delete;
+
+	PainterHighQualityEnabler(
+		const PainterHighQualityEnabler &other) = delete;
+	PainterHighQualityEnabler &operator=(
+		const PainterHighQualityEnabler &other) = delete;
+
 	~PainterHighQualityEnabler() {
 		if (_hints) {
 			_painter.setRenderHints(_hints, false);
@@ -206,7 +210,7 @@ public:
 	}
 
 private:
-	Painter &_painter;
+	QPainter &_painter;
 	QPainter::RenderHints _hints = 0;
 
 };
diff --git a/Telegram/SourceFiles/ui/widgets/buttons.cpp b/Telegram/SourceFiles/ui/widgets/buttons.cpp
index 3153d58df..dd60bd69a 100644
--- a/Telegram/SourceFiles/ui/widgets/buttons.cpp
+++ b/Telegram/SourceFiles/ui/widgets/buttons.cpp
@@ -538,8 +538,8 @@ CrossButton::CrossButton(QWidget *parent, const style::CrossButton &st) : Ripple
 void CrossButton::step_loading(TimeMs ms, bool timer) {
 	if (stopLoadingAnimation(ms)) {
 		_a_loading.stop();
-	}
-	if (timer) {
+		update();
+	} else if (timer && !anim::Disabled()) {
 		update();
 	}
 }
@@ -584,11 +584,30 @@ void CrossButton::paintEvent(QPaintEvent *e) {
 	if (_a_loading.animating()) {
 		if (stopLoadingAnimation(ms)) {
 			_a_loading.stop();
+		} else if (anim::Disabled()) {
+			CrossAnimation::paintStaticLoading(
+				p,
+				_st.cross,
+				over ? _st.crossFgOver : _st.crossFg,
+				_st.crossPosition.x(),
+				_st.crossPosition.y(),
+				width(),
+				shown);
+			return;
 		} else {
-			loading = ((ms - _loadingStartMs) % _st.loadingPeriod) / float64(_st.loadingPeriod);
+			loading = ((ms - _loadingStartMs) % _st.loadingPeriod)
+				/ float64(_st.loadingPeriod);
 		}
 	}
-	CrossAnimation::paint(p, _st.cross, over ? _st.crossFgOver : _st.crossFg, _st.crossPosition.x(), _st.crossPosition.y(), width(), shown, loading);
+	CrossAnimation::paint(
+		p,
+		_st.cross,
+		over ? _st.crossFgOver : _st.crossFg,
+		_st.crossPosition.x(),
+		_st.crossPosition.y(),
+		width(),
+		shown,
+		loading);
 }
 
 bool CrossButton::stopLoadingAnimation(TimeMs ms) {
@@ -617,6 +636,9 @@ void CrossButton::setLoadingAnimation(bool enabled) {
 			_a_loading.stop();
 		}
 	}
+	if (anim::Disabled()) {
+		update();
+	}
 }
 
 void CrossButton::onStateChanged(State was, StateChangeSource source) {
diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp
index 2216a3ccf..5cedccce0 100644
--- a/Telegram/SourceFiles/window/notifications_manager_default.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp
@@ -393,6 +393,9 @@ void Widget::opacityAnimationCallback() {
 }
 
 void Widget::step_shift(float64 ms, bool timer) {
+	if (anim::Disabled()) {
+		ms += st::notifyFastAnim;
+	}
 	float64 dt = ms / float64(st::notifyFastAnim);
 	if (dt >= 1) {
 		a_shift.finish();
diff --git a/Telegram/SourceFiles/window/window_connecting_widget.cpp b/Telegram/SourceFiles/window/window_connecting_widget.cpp
index 232b3327f..3710b9090 100644
--- a/Telegram/SourceFiles/window/window_connecting_widget.cpp
+++ b/Telegram/SourceFiles/window/window_connecting_widget.cpp
@@ -59,7 +59,7 @@ void Progress::paintEvent(QPaintEvent *e) {
 }
 
 void Progress::step(TimeMs ms, bool timer) {
-	if (timer) {
+	if (timer && !anim::Disabled()) {
 		update();
 	}
 }