From b0925f97d0e87a1b470effcb6852c0d8c83472dd Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 11 Dec 2020 10:30:51 +0300
Subject: [PATCH] Moved InterpolateF to animation_value header.

---
 ui/effects/animation_value.h    | 6 +++++-
 ui/widgets/call_mute_button.cpp | 8 ++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ui/effects/animation_value.h b/ui/effects/animation_value.h
index cf86236..faf308a 100644
--- a/ui/effects/animation_value.h
+++ b/ui/effects/animation_value.h
@@ -94,8 +94,12 @@ private:
 
 };
 
+TG_FORCE_INLINE float64 interpolateF(int a, int b, float64 b_ratio) {
+	return a + float64(b - a) * b_ratio;
+}
+
 TG_FORCE_INLINE int interpolate(int a, int b, float64 b_ratio) {
-	return qRound(a + float64(b - a) * b_ratio);
+	return std::round(interpolateF(a, b, b_ratio));
 }
 
 #ifdef ARCH_CPU_32_BITS
diff --git a/ui/widgets/call_mute_button.cpp b/ui/widgets/call_mute_button.cpp
index 019b452..e4a2151 100644
--- a/ui/widgets/call_mute_button.cpp
+++ b/ui/widgets/call_mute_button.cpp
@@ -109,10 +109,6 @@ auto Colors() {
 	};
 }
 
-inline float64 InterpolateF(int a, int b, float64 b_ratio) {
-	return a + float64(b - a) * b_ratio;
-}
-
 bool IsMuted(CallMuteButtonType type) {
 	return (type != CallMuteButtonType::Active);
 }
@@ -402,7 +398,7 @@ void CallMuteButton::init() {
 
 			const auto crossProgress = (crossFrom == crossTo)
 				? crossTo
-				: InterpolateF(crossFrom, crossTo, value);
+				: anim::interpolateF(crossFrom, crossTo, value);
 			if (crossProgress != _crossLineProgress) {
 				_crossLineProgress = crossProgress;
 				_content->update(_muteIconPosition);
@@ -410,7 +406,7 @@ void CallMuteButton::init() {
 
 			const auto radialShowProgress = (radialShowFrom == radialShowTo)
 				? radialShowTo
-				: InterpolateF(radialShowFrom, radialShowTo, value);
+				: anim::interpolateF(radialShowFrom, radialShowTo, value);
 			if (radialShowProgress != _radialShowProgress.current()) {
 				_radialShowProgress = radialShowProgress;
 			}