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

Replaced display of stop icon in voice record bar with pause icon.

Browse source
This commit is contained in:
23rd 2024-01-24 02:41:22 +03:00 • committed by John Preston
parent 7542f04010
commit 5130c5df80
1 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
View file

@ -29,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "media/player/media_player_instance.h" #include "media/player/media_player_instance.h"
#include "ui/controls/send_button.h" #include "ui/controls/send_button.h"
#include "ui/effects/animation_value.h" #include "ui/effects/animation_value.h"
#include "ui/effects/animation_value_f.h"
#include "ui/effects/ripple_animation.h" #include "ui/effects/ripple_animation.h"
#include "ui/text/format_values.h" #include "ui/text/format_values.h"
#include "ui/text/text_utilities.h" #include "ui/text/text_utilities.h"
@ -960,15 +961,24 @@ void RecordLock::drawProgress(QPainter &p) {
const auto lockTranslation = QPoint( const auto lockTranslation = QPoint(
(inner.width() - size.width()) / 2, (inner.width() - size.width()) / 2,
(_st.originTop.height() * 2 - size.height()) / 2); (_st.originTop.height() * 2 - size.height()) / 2);
const auto xRadius = anim::interpolate(2, 3, _lockToStopProgress); const auto xRadius = anim::interpolateF(2, 3, _lockToStopProgress);
const auto pauseLineOffset = blockRectWidth / 2
+ st::historyRecordLockIconLineWidth;
if (_lockToStopProgress == 1.) { if (_lockToStopProgress == 1.) {
// Paint the block. // Paint the block.
auto hq = PainterHighQualityEnabler(p); auto hq = PainterHighQualityEnabler(p);
p.translate(inner.topLeft() + lockTranslation); p.translate(inner.topLeft() + lockTranslation);
p.setPen(Qt::NoPen); p.setPen(Qt::NoPen);
p.setBrush(_st.fg); p.setBrush(_st.fg);
p.drawRoundedRect(blockRect, xRadius, 3); p.drawRoundedRect(
blockRect - QMargins(0, 0, pauseLineOffset, 0),
xRadius,
3);
p.drawRoundedRect(
blockRect - QMargins(pauseLineOffset, 0, 0, 0),
xRadius,
3);
} else { } else {
// Paint an animation frame. // Paint an animation frame.
auto frame = QImage( auto frame = QImage(
@ -984,7 +994,20 @@ void RecordLock::drawProgress(QPainter &p) {
q.setBrush(_arcPen.brush()); q.setBrush(_arcPen.brush());
q.translate(lockTranslation); q.translate(lockTranslation);
q.drawRoundedRect(blockRect, xRadius, 3); {
const auto offset = anim::interpolateF(
0,
pauseLineOffset,
_lockToStopProgress);
q.drawRoundedRect(
blockRect - QMarginsF(0, 0, offset, 0),
xRadius,
3);
q.drawRoundedRect(
blockRect - QMarginsF(offset, 0, 0, 0),
xRadius,
3);
}
const auto offsetTranslate = _lockToStopProgress * const auto offsetTranslate = _lockToStopProgress *
(lineHeight + arcHeight + _arcPen.width() * 2); (lineHeight + arcHeight + _arcPen.width() * 2);
@ -996,7 +1019,12 @@ void RecordLock::drawProgress(QPainter &p) {
q.rotate(kLockArcAngle * progress); q.rotate(kLockArcAngle * progress);
} }
q.setPen(_arcPen); const auto lockProgress = 1. - _lockToStopProgress;
{
auto arcPen = _arcPen;
arcPen.setWidthF(_arcPen.widthF() * lockProgress);
q.setPen(arcPen);
}
const auto rLine = QLineF(0, 0, 0, -lineHeight); const auto rLine = QLineF(0, 0, 0, -lineHeight);
q.drawLine(rLine); q.drawLine(rLine);
@ -1008,7 +1036,6 @@ void RecordLock::drawProgress(QPainter &p) {
0, 0,
arc::kHalfLength); arc::kHalfLength);
const auto lockProgress = 1. - _lockToStopProgress;
if (progress == 1. && lockProgress < 1.) { if (progress == 1. && lockProgress < 1.) {
q.drawLine( q.drawLine(
-arcWidth, -arcWidth,