RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replaced gradient stops with gradient colors in EmojiUserpic of builder.

This commit is contained in:
23rd 2023-01-25 19:54:03 +03:00 committed by John Preston
parent 2f7e4ae8fb
commit cae97cb062
3 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_preview.cpp
View File

@ -12,8 +12,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_document_media.h"
#include "data/data_session.h"
#include "history/view/media/history_view_sticker_player.h"
#include "info/userpic/info_userpic_emoji_builder_common.h"
#include "main/main_session.h"
#include "ui/painter.h"
#include "ui/rect.h"
namespace UserpicBuilder {
@ -78,11 +78,8 @@ void PreviewPainter::setDocument(
}, _lifetime);
}
void PreviewPainter::paintBackground(QPainter &p, const QBrush &brush) {
PainterHighQualityEnabler hq(p);
p.setPen(Qt::NoPen);
p.setBrush(brush);
p.drawEllipse(0, 0, _size, _size);
void PreviewPainter::paintBackground(QPainter &p, const QImage &image) {
p.drawImage(0, 0, image);
}
bool PreviewPainter::paintForeground(QPainter &p) {
@ -126,15 +123,10 @@ void EmojiUserpic::setDocument(not_null<DocumentData*> document) {
}
void EmojiUserpic::result(int size, Fn<void(QImage &&image)> done) {
const auto colors = ranges::views::all(
_stops
) | ranges::views::transform([](const QGradientStop &stop) {
return stop.second;
}) | ranges::to_vector;
const auto painter = lifetime().make_state<PreviewPainter>(size);
// Reset to the first frame.
painter->setDocument(_painter.document(), [=] {
auto background = Images::GenerateLinearGradient(Size(size), colors);
auto background = GenerateGradient(Size(size), _colors, false);
auto p = QPainter(&background);
while (true) {
@ -146,20 +138,16 @@ void EmojiUserpic::result(int size, Fn<void(QImage &&image)> done) {
});
}
void EmojiUserpic::setGradientStops(QGradientStops stops) {
if (_stops == stops) {
void EmojiUserpic::setGradientColors(std::vector<QColor> colors) {
if (_colors == colors) {
return;
}
if (!_stops.empty()) {
auto gradient = QLinearGradient(0, 0, width() / 2., height());
gradient.setStops(base::take(_stops));
_previousBrush = QBrush(std::move(gradient));
if (const auto colors = base::take(_colors); !colors.empty()) {
_previousImage = GenerateGradient(size(), colors);
}
_stops = std::move(stops);
_colors = std::move(colors);
{
auto gradient = QLinearGradient(0, 0, width() / 2., height());
gradient.setStops(_stops);
_brush = QBrush(std::move(gradient));
_image = GenerateGradient(size(), _colors);
}
if (_duration) {
_animation.stop();
@ -172,13 +160,13 @@ void EmojiUserpic::setGradientStops(QGradientStops stops) {
void EmojiUserpic::paintEvent(QPaintEvent *event) {
auto p = QPainter(this);
if (_animation.animating() && (_previousBrush != Qt::NoBrush)) {
_painter.paintBackground(p, _previousBrush);
if (_animation.animating() && !_previousImage.isNull()) {
_painter.paintBackground(p, _previousImage);
p.setOpacity(_animation.value(1.));
}
_painter.paintBackground(p, _brush);
_painter.paintBackground(p, _image);
p.setOpacity(1.);
_painter.paintForeground(p);

10
Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_preview.h
View File

@ -33,7 +33,7 @@ public:
not_null<DocumentData*> document,
Fn<void()> updateCallback);
void paintBackground(QPainter &p, const QBrush &brush);
void paintBackground(QPainter &p, const QImage &image);
bool paintForeground(QPainter &p);
private:
@ -53,7 +53,7 @@ public:
EmojiUserpic(not_null<Ui::RpWidget*> parent, const QSize &size);
void result(int size, Fn<void(QImage &&image)> done);
void setGradientStops(QGradientStops stops);
void setGradientColors(std::vector<QColor> colors);
void setDocument(not_null<DocumentData*> document);
void setDuration(crl::time duration);
@ -63,9 +63,9 @@ protected:
private:
PreviewPainter _painter;
QBrush _previousBrush;
QBrush _brush;
QGradientStops _stops;
QImage _previousImage;
QImage _image;
std::vector<QColor> _colors;
crl::time _duration;
Ui::Animations::Simple _animation;

9
Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
View File

@ -277,7 +277,12 @@ not_null<Ui::VerticalLayout*> CreateUserpicBuilder(
data.builderColorIndex);
palette->stopsValue(
) | rpl::start_with_next([=](QGradientStops stops) {
preview->setGradientStops(std::move(stops));
const auto colors = ranges::views::all(
stops
) | ranges::views::transform([](const QGradientStop &stop) {
return stop.second;
}) | ranges::to_vector;
preview->setGradientColors(colors);
}, preview->lifetime());
paletteBg->innerRectValue(
) | rpl::start_with_next([=](const QRect &r) {
@ -339,7 +344,7 @@ not_null<Ui::RpWidget*> CreateEmojiUserpic(
) | rpl::start_with_next([=](int index) {
const auto c = Ui::EmptyUserpic::UserpicColor(
Ui::EmptyUserpic::ColorIndex(index));
widget->setGradientStops({ { 0, c.color1->c }, { 1, c.color2->c } });
widget->setGradientColors({ c.color1->c, c.color2->c });
}, widget->lifetime());
return widget;
}