procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix radial progress on in-chat streaming start.

This commit is contained in:
John Preston 2019-12-27 15:55:02 +03:00
parent 74e2175a7a
commit ac48ec5969
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Telegram/SourceFiles/history/view/media/history_view_gif.cpp
View File

@ -283,9 +283,14 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
: activeOwnPlaying : activeOwnPlaying
? &activeOwnPlaying->instance ? &activeOwnPlaying->instance
: nullptr; : nullptr;
const auto streamedForWaiting = activeRoundPlaying
? activeRoundPlaying
: _streamed
? &_streamed->instance
: nullptr;
if (displayLoading if (displayLoading
&& (!streamed && (!streamedForWaiting
|| item->isSending() || item->isSending()
|| (cornerDownload && _data->loading()))) { || (cornerDownload && _data->loading()))) {
ensureAnimation(); ensureAnimation();
@ -295,7 +300,7 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
} }
updateStatusText(); updateStatusText();
const auto radial = isRadialAnimation() const auto radial = isRadialAnimation()
|| (streamed && streamed->waitingShown()); || (streamedForWaiting && streamedForWaiting->waitingShown());
if (bubble) { if (bubble) {
if (!_caption.isEmpty()) { if (!_caption.isEmpty()) {
@ -425,8 +430,8 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
&& ((!_data->loaded() && !_data->loading()) || !autoplay))) { && ((!_data->loaded() && !_data->loading()) || !autoplay))) {
const auto radialOpacity = (item->isSending() || _data->uploading()) const auto radialOpacity = (item->isSending() || _data->uploading())
? 1. ? 1.
: streamed : streamedForWaiting
? streamed->waitingOpacity() ? streamedForWaiting->waitingOpacity()
: (radial && _data->loaded()) : (radial && _data->loaded())
? _animation->radial.opacity() ? _animation->radial.opacity()
: 1.; : 1.;
@ -471,10 +476,10 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
const auto fg = selected const auto fg = selected
? st::historyFileThumbRadialFgSelected ? st::historyFileThumbRadialFgSelected
: st::historyFileThumbRadialFg; : st::historyFileThumbRadialFg;
if (streamed && !_data->uploading()) { if (streamedForWaiting && !_data->uploading()) {
Ui::InfiniteRadialAnimation::Draw( Ui::InfiniteRadialAnimation::Draw(
p, p,
streamed->waitingState(), streamedForWaiting->waitingState(),
rinner.topLeft(), rinner.topLeft(),
rinner.size(), rinner.size(),
width(), width(),
@ -869,9 +874,12 @@ void Gif::drawGrouped(
const auto streamed = activeOwnPlaying const auto streamed = activeOwnPlaying
? &activeOwnPlaying->instance ? &activeOwnPlaying->instance
: nullptr; : nullptr;
const auto streamedForWaiting = _streamed
? &_streamed->instance
: nullptr;
if (displayLoading if (displayLoading
&& (!streamed && (!streamedForWaiting
|| item->isSending() || item->isSending()
|| _data->uploading() || _data->uploading()
|| (cornerDownload && _data->loading()))) { || (cornerDownload && _data->loading()))) {
@ -882,7 +890,7 @@ void Gif::drawGrouped(
} }
updateStatusText(); updateStatusText();
const auto radial = isRadialAnimation() const auto radial = isRadialAnimation()
|| (streamed && streamed->waitingShown()); || (streamedForWaiting && streamedForWaiting->waitingShown());
const auto roundRadius = ImageRoundRadius::Large; const auto roundRadius = ImageRoundRadius::Large;
@ -933,8 +941,8 @@ void Gif::drawGrouped(
&& ((!_data->loaded() && !_data->loading()) || !autoplay))) { && ((!_data->loaded() && !_data->loading()) || !autoplay))) {
const auto radialOpacity = (item->isSending() || _data->uploading()) const auto radialOpacity = (item->isSending() || _data->uploading())
? 1. ? 1.
: streamed : streamedForWaiting
? streamed->waitingOpacity() ? streamedForWaiting->waitingOpacity()
: (radial && _data->loaded()) : (radial && _data->loaded())
? _animation->radial.opacity() ? _animation->radial.opacity()
: 1.; : 1.;
@ -997,10 +1005,10 @@ void Gif::drawGrouped(
const auto fg = selected const auto fg = selected
? st::historyFileThumbRadialFgSelected ? st::historyFileThumbRadialFgSelected
: st::historyFileThumbRadialFg; : st::historyFileThumbRadialFg;
if (streamed && !_data->uploading()) { if (streamedForWaiting && !_data->uploading()) {
Ui::InfiniteRadialAnimation::Draw( Ui::InfiniteRadialAnimation::Draw(
p, p,
streamed->waitingState(), streamedForWaiting->waitingState(),
rinner.topLeft(), rinner.topLeft(),
rinner.size(), rinner.size(),
width(), width(),