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

Support new rounding in theme preview generator.

Browse source
This commit is contained in:
John Preston 2022-10-04 10:11:15 +04:00
parent f167cdad6f
commit 83008fa358
5 changed files with 54 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Telegram/SourceFiles/ui/cached_round_corners.cpp
View file

@ -30,13 +30,12 @@ std::array<std::array<QImage, 4>, kCachedCornerRadiusCount> CachedMasks;
[[nodiscard]] std::array<QImage, 4> PrepareCorners(int32 radius, const QBrush &brush, const style::color *shadow = nullptr) { [[nodiscard]] std::array<QImage, 4> PrepareCorners(int32 radius, const QBrush &brush, const style::color *shadow = nullptr) {
int32 r = radius * style::DevicePixelRatio(), s = st::msgShadow * style::DevicePixelRatio(); int32 r = radius * style::DevicePixelRatio(), s = st::msgShadow * style::DevicePixelRatio();
QImage rect(r * 3, r * 3 + (shadow ? s : 0), QImage::Format_ARGB32_Premultiplied); QImage rect(r * 3, r * 3 + (shadow ? s : 0), QImage::Format_ARGB32_Premultiplied);
rect.fill(Qt::transparent);
{ {
auto p = QPainter(&rect); auto p = QPainter(&rect);
PainterHighQualityEnabler hq(p); PainterHighQualityEnabler hq(p);
p.setCompositionMode(QPainter::CompositionMode_Source); p.setCompositionMode(QPainter::CompositionMode_Source);
p.fillRect(QRect(0, 0, rect.width(), rect.height()), Qt::transparent);
p.setCompositionMode(QPainter::CompositionMode_SourceOver);
p.setPen(Qt::NoPen); p.setPen(Qt::NoPen);
if (shadow) { if (shadow) {
p.setBrush((*shadow)->b); p.setBrush((*shadow)->b);

5
Telegram/SourceFiles/ui/chat/chat_style.cpp
View file

@ -418,6 +418,11 @@ ChatStyle::ChatStyle() {
st::historyVideoMessageMuteSelected); st::historyVideoMessageMuteSelected);
} }
ChatStyle::ChatStyle(not_null<const style::palette*> isolated)
: ChatStyle() {
assignPalette(isolated);
}
void ChatStyle::apply(not_null<ChatTheme*> theme) { void ChatStyle::apply(not_null<ChatTheme*> theme) {
const auto themePalette = theme->palette(); const auto themePalette = theme->palette();
assignPalette(themePalette assignPalette(themePalette

1
Telegram/SourceFiles/ui/chat/chat_style.h
View file

@ -161,6 +161,7 @@ struct ChatPaintContext {
class ChatStyle final : public style::palette { class ChatStyle final : public style::palette {
public: public:
ChatStyle(); ChatStyle();
explicit ChatStyle(not_null<const style::palette*> isolated);
void apply(not_null<ChatTheme*> theme); void apply(not_null<ChatTheme*> theme);

80
Telegram/SourceFiles/window/themes/window_theme_preview.cpp
View file

@ -15,6 +15,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/emoji_config.h" #include "ui/emoji_config.h"
#include "ui/painter.h" #include "ui/painter.h"
#include "ui/chat/chat_theme.h" #include "ui/chat/chat_theme.h"
#include "ui/chat/chat_style.h"
#include "ui/chat/message_bubble.h"
#include "ui/image/image_prepare.h" #include "ui/image/image_prepare.h"
#include "styles/style_widgets.h" #include "styles/style_widgets.h"
#include "styles/style_window.h" #include "styles/style_window.h"
@ -124,7 +126,8 @@ private:
bool outbg = false; bool outbg = false;
Status status = Status::None; Status status = Status::None;
QString date; QString date;
bool attached = false; bool attachToTop = false;
bool attachToBottom = false;
bool tail = true; bool tail = true;
Ui::Text::String text = { st::msgMinWidth }; Ui::Text::String text = { st::msgMinWidth };
QVector<int> waveform; QVector<int> waveform;
@ -175,6 +178,7 @@ private:
const style::palette &_palette; const style::palette &_palette;
const CurrentData _current; const CurrentData _current;
const PreviewType _type; const PreviewType _type;
Ui::ChatStyle _st;
Painter *_p = nullptr; Painter *_p = nullptr;
QRect _rect; QRect _rect;
@ -383,9 +387,10 @@ void Generator::generateData() {
addTextBubble("Twenty years from now you will be more disappointed by the things that you didn't do than by the ones you did do. " + QString::fromUtf8("\xf0\x9f\xa7\x90"), "10:00", Status::Received); addTextBubble("Twenty years from now you will be more disappointed by the things that you didn't do than by the ones you did do. " + QString::fromUtf8("\xf0\x9f\xa7\x90"), "10:00", Status::Received);
_bubbles.back().tail = false; _bubbles.back().tail = false;
_bubbles.back().outbg = true; _bubbles.back().outbg = true;
_bubbles.back().attachToBottom = true;
addTextBubble("Mark Twain said that " + QString::fromUtf8("\xe2\x98\x9d\xef\xb8\x8f"), "10:00", Status::Received); addTextBubble("Mark Twain said that " + QString::fromUtf8("\xe2\x98\x9d\xef\xb8\x8f"), "10:00", Status::Received);
_bubbles.back().outbg = true; _bubbles.back().outbg = true;
_bubbles.back().attached = true; _bubbles.back().attachToTop = true;
_bubbles.back().tail = true; _bubbles.back().tail = true;
addTextBubble("We are too smart for this world. " + QString::fromUtf8("\xf0\x9f\xa4\xa3\xf0\x9f\x98\x82"), "11:00", Status::None); addTextBubble("We are too smart for this world. " + QString::fromUtf8("\xf0\x9f\xa4\xa3\xf0\x9f\x98\x82"), "11:00", Status::None);
_bubbles.back().replyName.setText(st::msgNameStyle, "Alex Cassio", Ui::NameTextOptions()); _bubbles.back().replyName.setText(st::msgNameStyle, "Alex Cassio", Ui::NameTextOptions());
@ -399,7 +404,8 @@ Generator::Generator(
: _theme(theme) : _theme(theme)
, _palette(_theme.palette) , _palette(_theme.palette)
, _current(std::move(current)) , _current(std::move(current))
, _type(type) { , _type(type)
, _st(&_palette) {
} }
QImage Generator::generate() { QImage Generator::generate() {
@ -589,8 +595,8 @@ void Generator::paintComposeArea() {
auto field = QRect(fieldLeft, fieldTop, fieldWidth, fieldHeight); auto field = QRect(fieldLeft, fieldTop, fieldWidth, fieldHeight);
_p->fillRect(field, st::historyComposeField.textBg[_palette]); _p->fillRect(field, st::historyComposeField.textBg[_palette]);
_p->save();
_p->setClipRect(field); _p->setClipRect(field);
_p->save();
_p->setFont(st::historyComposeField.font); _p->setFont(st::historyComposeField.font);
_p->setPen(st::historyComposeField.placeholderFg[_palette]); _p->setPen(st::historyComposeField.placeholderFg[_palette]);
@ -691,7 +697,7 @@ void Generator::paintRow(const Row &row) {
rectForName.setLeft(rectForName.left() + st::dialogsChatTypeSkip); rectForName.setLeft(rectForName.left() + st::dialogsChatTypeSkip);
} }
auto texttop = st.textTop; auto texttop = y + st.textTop;
auto dateWidth = st::dialogsDateFont->width(row.date); auto dateWidth = st::dialogsDateFont->width(row.date);
rectForName.setWidth(rectForName.width() - dateWidth - st::dialogsDateSkip); rectForName.setWidth(rectForName.width() - dateWidth - st::dialogsDateSkip);
@ -771,9 +777,9 @@ void Generator::paintBubble(const Bubble &bubble) {
auto y = _historyBottom - st::msgMargin.bottom() - height; auto y = _historyBottom - st::msgMargin.bottom() - height;
auto bubbleTop = y; auto bubbleTop = y;
auto bubbleHeight = height; auto bubbleHeight = height;
if (isPhoto) { // #TODO rounding if (isPhoto) {
bubbleTop -= st::bubbleRadiusSmall + 1; bubbleTop -= st::bubbleRadiusLarge + 1;
bubbleHeight += st::bubbleRadiusSmall + 1; bubbleHeight += st::bubbleRadiusLarge + 1;
} }
auto left = bubble.outbg ? st::msgMargin.right() : st::msgMargin.left(); auto left = bubble.outbg ? st::msgMargin.right() : st::msgMargin.left();
@ -782,33 +788,39 @@ void Generator::paintBubble(const Bubble &bubble) {
} }
x += left; x += left;
_p->setPen(Qt::NoPen); using Corner = Ui::BubbleCornerRounding;
auto tailclip = st::bubbleRadiusSmall +1; auto rounding = Ui::BubbleRounding{
if (bubble.tail) { Corner::Large,
if (bubble.outbg) { Corner::Large,
_p->setClipRegion(QRegion(_history) - QRect(x + bubble.width - tailclip, bubbleTop + bubbleHeight - tailclip, tailclip + st::bubbleRadiusSmall, tailclip + st::bubbleRadiusSmall)); Corner::Large,
} else { Corner::Large,
_p->setClipRegion(QRegion(_history) - QRect(x - st::bubbleRadiusSmall, bubbleTop + bubbleHeight - tailclip, tailclip + st::bubbleRadiusSmall, tailclip + st::bubbleRadiusSmall)); };
} if (bubble.outbg) {
} if (bubble.attachToTop) {
auto sh = bubble.outbg ? st::msgOutShadow[_palette] : st::msgInShadow[_palette]; rounding.topRight = Corner::Small;
_p->setBrush(sh); }
_p->drawRoundedRect(x, bubbleTop + st::msgShadow, bubble.width, bubbleHeight, st::bubbleRadiusSmall, st::bubbleRadiusSmall); if (bubble.attachToBottom) {
auto bg = bubble.outbg ? st::msgOutBg[_palette] : st::msgInBg[_palette]; rounding.bottomRight = Corner::Small;
_p->setBrush(bg); } else if (bubble.tail) {
_p->drawRoundedRect(x, bubbleTop, bubble.width, bubbleHeight, st::bubbleRadiusSmall, st::bubbleRadiusSmall); rounding.bottomRight = Corner::Tail;
if (bubble.tail) { }
_p->setClipRect(_history); } else {
if (bubble.outbg) { if (bubble.attachToTop) {
_p->fillRect(QRect(x + bubble.width - tailclip, bubbleTop + bubbleHeight - tailclip, tailclip, tailclip), bg); rounding.topLeft = Corner::Small;
_p->fillRect(QRect(x + bubble.width - tailclip, bubbleTop + bubbleHeight, tailclip + st::historyBubbleTailOutRight.width(), st::msgShadow), sh); }
st::historyBubbleTailOutRight[_palette].paint(*_p, x + bubble.width, bubbleTop + bubbleHeight - st::historyBubbleTailOutRight.height(), _rect.width()); if (bubble.attachToBottom) {
} else { rounding.bottomLeft = Corner::Small;
_p->fillRect(QRect(x, bubbleTop + bubbleHeight - tailclip, tailclip, tailclip), bg); } else if (bubble.tail) {
_p->fillRect(QRect(x - st::historyBubbleTailInLeft.width(), bubbleTop + bubbleHeight, tailclip + st::historyBubbleTailInLeft.width(), st::msgShadow), sh); rounding.bottomLeft = Corner::Tail;
st::historyBubbleTailInLeft[_palette].paint(*_p, x - st::historyBubbleTailInLeft.width(), bubbleTop + bubbleHeight - st::historyBubbleTailOutRight.height(), _rect.width());
} }
} }
Ui::PaintBubble(*_p, Ui::SimpleBubble{
.st = &_st,
.geometry = QRect(x, bubbleTop, bubble.width, bubbleHeight),
.outerWidth = _rect.width(),
.outbg = bubble.outbg,
.rounding = rounding,
});
auto trect = QRect(x, y, bubble.width, bubble.height); auto trect = QRect(x, y, bubble.width, bubble.height);
if (isPhoto) { if (isPhoto) {
@ -922,7 +934,7 @@ void Generator::paintBubble(const Bubble &bubble) {
(*icon)[_palette].paint(*_p, QPoint(infoRight, infoBottom) + st::historySendStatePosition, _rect.width()); (*icon)[_palette].paint(*_p, QPoint(infoRight, infoBottom) + st::historySendStatePosition, _rect.width());
} }
_historyBottom = y - (bubble.attached ? st::msgMarginTopAttached : st::msgMargin.top()); _historyBottom = y - (bubble.attachToTop ? st::msgMarginTopAttached : st::msgMargin.top());
if (isPhoto) { if (isPhoto) {
auto image = bubble.photo.scaled(bubble.photoWidth * cIntRetinaFactor(), bubble.photoHeight * cIntRetinaFactor(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation); auto image = bubble.photo.scaled(bubble.photoWidth * cIntRetinaFactor(), bubble.photoHeight * cIntRetinaFactor(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit eafd7dc818433ec435c2862bb91b7e3c7f65336b Subproject commit 04e6428fec0f295df149ada3a6a51053a0884761