void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Slightly improved progress radial for voice messages with ttl.

Browse source
This commit is contained in:
23rd 2024-01-14 13:36:24 +03:00 • committed by John Preston
parent ad6890e7dd
commit 5273fbf57b
1 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Telegram/SourceFiles/history/view/media/history_view_document.cpp
View file

@ -186,7 +186,8 @@ void PaintWaveform(
const PaintContext &context, const PaintContext &context,
const VoiceData *voiceData, const VoiceData *voiceData,
int availableWidth, int availableWidth,
float64 progress) { float64 progress,
bool ttl) {
const auto wf = [&]() -> const VoiceWaveform* { const auto wf = [&]() -> const VoiceWaveform* {
if (!voiceData) { if (!voiceData) {
return nullptr; return nullptr;
@ -198,11 +199,14 @@ void PaintWaveform(
} }
return &voiceData->waveform; return &voiceData->waveform;
}(); }();
if (ttl) {
progress = 1. - progress;
}
const auto stm = context.messageStyle(); const auto stm = context.messageStyle();
// Rescale waveform by going in waveform.size * bar_count 1D grid. // Rescale waveform by going in waveform.size * bar_count 1D grid.
const auto active = stm->msgWaveformActive; const auto active = stm->msgWaveformActive;
const auto inactive = stm->msgWaveformInactive; const auto inactive = ttl ? stm->msgBg : stm->msgWaveformInactive;
const auto wfSize = wf const auto wfSize = wf
? int(wf->size()) ? int(wf->size())
: ::Media::Player::kWaveformSamplesCount; : ::Media::Player::kWaveformSamplesCount;
@ -755,8 +759,28 @@ void Document::draw(
: nullptr; : nullptr;
const auto paintContent = [&](QPainter &q) { const auto paintContent = [&](QPainter &q) {
constexpr auto kPenWidth = 1.5;
if (_drawTtl) { if (_drawTtl) {
_drawTtl(q, inner, context.st->historyFileInIconFg()->c); _drawTtl(q, inner, context.st->historyFileInIconFg()->c);
const auto voice = Get<HistoryDocumentVoice>();
const auto progress = (voice && voice->playback)
? voice->playback->progress.current()
: 0.;
if (progress > 0.) {
auto pen = stm->msgBg->p;
pen.setWidthF(style::ConvertScaleExact(kPenWidth));
pen.setCapStyle(Qt::RoundCap);
q.setPen(pen);
const auto from = arc::kQuarterLength;
const auto len = std::round(arc::kFullLength
* (1. - progress));
const auto stepInside = pen.widthF() * 2;
auto hq = PainterHighQualityEnabler(q);
q.drawArc(inner - Margins(stepInside), from, len);
}
} else if (previous && radialOpacity > 0. && radialOpacity < 1.) { } else if (previous && radialOpacity > 0. && radialOpacity < 1.) {
PaintInterpolatedIcon(q, icon, *previous, radialOpacity, inner); PaintInterpolatedIcon(q, icon, *previous, radialOpacity, inner);
} else { } else {
@ -771,7 +795,7 @@ void Document::draw(
{ {
auto hq = PainterHighQualityEnabler(q); auto hq = PainterHighQualityEnabler(q);
auto pen = stm->msgBg->p; auto pen = stm->msgBg->p;
pen.setWidthF(style::ConvertScaleExact(1.5)); pen.setWidthF(style::ConvertScaleExact(kPenWidth));
q.setPen(pen); q.setPen(pen);
q.setBrush(Qt::NoBrush); q.setBrush(Qt::NoBrush);
q.drawEllipse(ttlRect); q.drawEllipse(ttlRect);
@ -843,11 +867,14 @@ void Document::draw(
if (_transcribedRound) { if (_transcribedRound) {
FillWaveform(_data->round()); FillWaveform(_data->round());
} }
const auto inTTLViewer = _parent->delegate()->elementContext()
== Context::TTLViewer;
PaintWaveform(p, PaintWaveform(p,
context, context,
_transcribedRound ? _data->round() : _data->voice(), _transcribedRound ? _data->round() : _data->voice(),
namewidth + st::msgWaveformSkip, namewidth + st::msgWaveformSkip,
progress); progress,
inTTLViewer);
p.restore(); p.restore();
} else if (auto named = Get<HistoryDocumentNamed>()) { } else if (auto named = Get<HistoryDocumentNamed>()) {
p.setFont(st::semiboldFont); p.setFont(st::semiboldFont);