kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Moved InterpolateF to animation_value header.

Browse source
This commit is contained in:
23rd 2020-12-11 10:30:51 +03:00
parent 37d939a650
commit b0925f97d0
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ui/effects/animation_value.h
View file

@ -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) { 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 #ifdef ARCH_CPU_32_BITS

8
ui/widgets/call_mute_button.cpp
View file

@ -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) { bool IsMuted(CallMuteButtonType type) {
return (type != CallMuteButtonType::Active); return (type != CallMuteButtonType::Active);
} }
@ -402,7 +398,7 @@ void CallMuteButton::init() {
const auto crossProgress = (crossFrom == crossTo) const auto crossProgress = (crossFrom == crossTo)
? crossTo ? crossTo
: InterpolateF(crossFrom, crossTo, value); : anim::interpolateF(crossFrom, crossTo, value);
if (crossProgress != _crossLineProgress) { if (crossProgress != _crossLineProgress) {
_crossLineProgress = crossProgress; _crossLineProgress = crossProgress;
_content->update(_muteIconPosition); _content->update(_muteIconPosition);
@ -410,7 +406,7 @@ void CallMuteButton::init() {
const auto radialShowProgress = (radialShowFrom == radialShowTo) const auto radialShowProgress = (radialShowFrom == radialShowTo)
? radialShowTo ? radialShowTo
: InterpolateF(radialShowFrom, radialShowTo, value); : anim::interpolateF(radialShowFrom, radialShowTo, value);
if (radialShowProgress != _radialShowProgress.current()) { if (radialShowProgress != _radialShowProgress.current()) {
_radialShowProgress = radialShowProgress; _radialShowProgress = radialShowProgress;
} }