kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Added ability to set disable monospace in numbers animation.

Browse source
This commit is contained in:
23rd 2022-05-24 08:50:24 +03:00
parent 7133ccd2f9
commit 79af7c5523
2 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ui/effects/numbers_animation.cpp
View file

@ -28,6 +28,10 @@ void NumbersAnimation::setDuration(int duration) {
_duration = duration; _duration = duration;
} }
void NumbersAnimation::setDisabledMonospace(bool value) {
_disabledMonospace = value;
}
void NumbersAnimation::setText(const QString &text, int value) { void NumbersAnimation::setText(const QString &text, int value) {
if (_a_ready.animating()) { if (_a_ready.animating()) {
_delayedText = text; _delayedText = text;
@ -80,8 +84,13 @@ void NumbersAnimation::realSetText(QString text, int value) {
--oldSize; --oldSize;
} }
} }
_fromWidth = oldSize * _digitWidth; if (_disabledMonospace) {
_toWidth = newSize * _digitWidth; _fromWidth = _toWidth;
_toWidth = _font->m.horizontalAdvance(text);
} else {
_fromWidth = oldSize * _digitWidth;
_toWidth = newSize * _digitWidth;
}
if (animating) { if (animating) {
_a_ready.start( _a_ready.start(
[this] { animationCallback(); }, [this] { animationCallback(); },
@ -122,30 +131,37 @@ void NumbersAnimation::paint(QPainter &p, int x, int y, int outerWidth) {
QString singleChar('0'); QString singleChar('0');
if (style::RightToLeft()) x = outerWidth - x - width; if (style::RightToLeft()) x = outerWidth - x - width;
x += width - _digits.size() * _digitWidth; x += width
- (_disabledMonospace ? _toWidth : _digits.size() * _digitWidth);
auto fromTop = anim::interpolate(0, _font->height, progress) * (_growing ? 1 : -1); auto fromTop = anim::interpolate(0, _font->height, progress) * (_growing ? 1 : -1);
auto toTop = anim::interpolate(_font->height, 0, progress) * (_growing ? -1 : 1); auto toTop = anim::interpolate(_font->height, 0, progress) * (_growing ? -1 : 1);
for (auto i = 0; i != digitsCount; ++i) { for (auto i = 0; i != digitsCount; ++i) {
auto &digit = _digits[i]; auto &digit = _digits[i];
auto from = digit.from; auto from = digit.from;
auto to = digit.to; auto to = digit.to;
const auto toCharWidth = (!_disabledMonospace || to.isDigit())
? _digitWidth
: _font->m.horizontalAdvance(to);
const auto fromCharWidth = (!_disabledMonospace || from.isDigit())
? _digitWidth
: _font->m.horizontalAdvance(from);
if (from == to) { if (from == to) {
p.setOpacity(1.); p.setOpacity(1.);
singleChar[0] = from; singleChar[0] = from;
p.drawText(x + (_digitWidth - digit.fromWidth) / 2, y + _font->ascent, singleChar); p.drawText(x + (toCharWidth - digit.fromWidth) / 2, y + _font->ascent, singleChar);
} else { } else {
if (from.unicode()) { if (from.unicode()) {
p.setOpacity(1. - progress); p.setOpacity(1. - progress);
singleChar[0] = from; singleChar[0] = from;
p.drawText(x + (_digitWidth - digit.fromWidth) / 2, y + fromTop + _font->ascent, singleChar); p.drawText(x + (fromCharWidth - digit.fromWidth) / 2, y + fromTop + _font->ascent, singleChar);
} }
if (to.unicode()) { if (to.unicode()) {
p.setOpacity(progress); p.setOpacity(progress);
singleChar[0] = to; singleChar[0] = to;
p.drawText(x + (_digitWidth - digit.toWidth) / 2, y + toTop + _font->ascent, singleChar); p.drawText(x + (toCharWidth - digit.toWidth) / 2, y + toTop + _font->ascent, singleChar);
} }
} }
x += _digitWidth; x += std::max(toCharWidth, fromCharWidth);
} }
p.setOpacity(1.); p.setOpacity(1.);
} }

3
ui/effects/numbers_animation.h
View file

@ -26,6 +26,7 @@ public:
} }
void setText(const QString &text, int value); void setText(const QString &text, int value);
void setDuration(int duration); void setDuration(int duration);
void setDisabledMonospace(bool value);
void finishAnimating(); void finishAnimating();
void paint(QPainter &p, int x, int y, int outerWidth); void paint(QPainter &p, int x, int y, int outerWidth);
@ -60,6 +61,8 @@ private:
int _value = 0; int _value = 0;
bool _growing = false; bool _growing = false;
bool _disabledMonospace = false;
Fn<void()> _animationCallback; Fn<void()> _animationCallback;
Fn<void()> _widthChangedCallback; Fn<void()> _widthChangedCallback;