From 0b7a2c18a2c3e54a36ccd9e476016eec68c5eb46 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 9 Nov 2022 12:16:20 +0400 Subject: [PATCH] Pause spoilers in reply / edit panels. --- .../history/history_item_components.cpp | 2 ++ .../SourceFiles/history/history_widget.cpp | 2 ++ .../controls/history_view_compose_controls.cpp | 18 +++++++++++------- .../controls/history_view_forward_panel.cpp | 2 ++ 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp index 804fc7fc3..ea31941ff 100644 --- a/Telegram/SourceFiles/history/history_item_components.cpp +++ b/Telegram/SourceFiles/history/history_item_components.cpp @@ -474,6 +474,8 @@ void HistoryMessageReply::paint( ? stm->replyTextPalette : st->imgReplyTextPalette()), .spoiler = Ui::Text::DefaultSpoilerCache(), + .now = context.now, + .paused = context.paused, .elisionLines = 1, }); p.setTextPalette(stm->textPalette); diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index dbf7ea21e..aa4e57559 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -7509,6 +7509,8 @@ void HistoryWidget::drawField(Painter &p, const QRect &rect) { .availableWidth = width() - replyLeft - _fieldBarCancel->width() - st::msgReplyPadding.right(), .palette = &st::historyComposeAreaPalette, .spoiler = Ui::Text::DefaultSpoilerCache(), + .now = crl::now(), + .paused = p.inactive(), .elisionLines = 1, }); } else { diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp index 32f71fc0d..620484b4a 100644 --- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp +++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp @@ -460,6 +460,8 @@ void FieldHeader::init() { paintRequest( ) | rpl::start_with_next([=] { Painter p(this); + p.setInactive( + _controller->isGifPausedAtLeastFor(Window::GifPauseReason::Any)); p.fillRect(rect(), st::historyComposeAreaBg); const auto position = st::historyReplyIconPosition; @@ -795,6 +797,8 @@ void FieldHeader::paintEditOrReplyToMessage(Painter &p) { .availableWidth = availableWidth, .palette = &st::historyComposeAreaPalette, .spoiler = Ui::Text::DefaultSpoilerCache(), + .now = crl::now(), + .paused = p.inactive(), .elisionLines = 1, }); } @@ -926,15 +930,15 @@ ComposeControls::ComposeControls( _wrap.get(), st::historyBotCommandStart)) , _autocomplete(std::make_unique( - parent, - window)) + parent, + window)) , _header(std::make_unique(_wrap.get(), _window)) , _voiceRecordBar(std::make_unique( - _wrap.get(), - parent, - window, - _send, - st::historySendSize.height())) + _wrap.get(), + parent, + window, + _send, + st::historySendSize.height())) , _sendMenuType(sendMenuType) , _unavailableEmojiPasted(unavailableEmojiPasted) , _saveDraftTimer([=] { saveDraft(); }) diff --git a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp index 072e124e1..33dfd7799 100644 --- a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp +++ b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp @@ -354,6 +354,8 @@ void ForwardPanel::paint( .availableWidth = available, .palette = &st::historyComposeAreaPalette, .spoiler = Ui::Text::DefaultSpoilerCache(), + .now = crl::now(), + .paused = p.inactive(), .elisionLines = 1, }); }