From 0eab40b22f160eafbff9ab11a4bf5e6f5073e904 Mon Sep 17 00:00:00 2001 From: ZavaruKitsu Date: Tue, 26 Dec 2023 12:08:29 +0300 Subject: [PATCH] fix: `simpleQuotesAndReplies` --- .../history/view/media/history_view_giveaway.cpp | 2 +- .../history/view/media/history_view_web_page.cpp | 8 +++++++- .../media/stories/media_stories_repost_view.cpp | 10 ++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp b/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp index 6205011a4..e0172434f 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp @@ -494,7 +494,7 @@ void PeerBubbleListPart::draw( geometry.x(), geometry.y(), width(), - &cache->bg); + &cache->bg2); if (peer.ripple->empty()) { peer.ripple = nullptr; } diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp index 1fb733056..1c622ce2f 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp @@ -31,6 +31,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/text/text_utilities.h" #include "styles/style_chat.h" +// AyuGram includes +#include "ayu/ayu_settings.h" + + namespace HistoryView { namespace { @@ -603,7 +607,9 @@ void WebPage::draw(Painter &p, const PaintContext &context) const { : nullptr; Ui::Text::ValidateQuotePaintCache(*cache, _st); Ui::Text::FillQuotePaint(p, outer, *cache, _st); - if (backgroundEmoji) { + + const auto settings = &AyuSettings::getInstance(); + if (!settings->simpleQuotesAndReplies && backgroundEmoji) { ValidateBackgroundEmoji( backgroundEmojiId, backgroundEmoji, diff --git a/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp index dd5c55ea7..608d7e6ab 100644 --- a/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp +++ b/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp @@ -26,6 +26,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_chat.h" #include "styles/style_media_view.h" +// AyuGram includes +#include "ayu/ayu_settings.h" + + namespace Media::Stories { RepostView::RepostView( @@ -95,7 +99,9 @@ void RepostView::draw(Painter &p, int x, int y, int availableWidth) { cache->bg = QColor(0, 0, 0, 64); Ui::Text::ValidateQuotePaintCache(*cache, quoteSt); Ui::Text::FillQuotePaint(p, rect, *cache, quoteSt); - if (backgroundEmoji) { + + const auto settings = &AyuSettings::getInstance(); + if (!settings->simpleQuotesAndReplies && backgroundEmoji) { using namespace HistoryView; if (backgroundEmoji->firstFrameMask.isNull() && !backgroundEmoji->emoji) { @@ -121,7 +127,7 @@ void RepostView::draw(Painter &p, int x, int y, int availableWidth) { cache->bg = rippleColor; if (_ripple) { - _ripple->paint(p, x, y, w, &rippleColor); + _ripple->paint(p, x, y, w, &cache->bg2); if (_ripple->empty()) { _ripple.reset(); }