diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp index 68ddcdcea..a581df43f 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp @@ -192,6 +192,7 @@ StickersListWidget::StickersListWidget( descriptor.show, descriptor.paused) , _mode(descriptor.mode) +, _requireConfirmation(descriptor.requireConfirmation) , _show(std::move(descriptor.show)) , _features(descriptor.features) , _overBg(st::roundRadiusLarge, st().overBg) @@ -1917,7 +1918,7 @@ void StickersListWidget::mouseReleaseEvent(QMouseEvent *e) { }); }); - if (settings->stickerConfirmation) { + if (settings->stickerConfirmation && (_mode == Mode::Full || _mode == Mode::ChatIntro) && _requireConfirmation) { Ui::show(Ui::MakeConfirmBox({ .text = tr::ayu_ConfirmationSticker(), .confirmed = sendStickerCallback, diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h index c436273fc..cb7a7e6ba 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h +++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h @@ -77,6 +77,7 @@ struct StickerCustomRecentDescriptor { struct StickersListDescriptor { std::shared_ptr show; StickersListMode mode = StickersListMode::Full; + bool requireConfirmation = true; Fn paused; std::vector customRecentList; const style::EmojiPan *st = nullptr; @@ -373,6 +374,7 @@ private: not_null document); const Mode _mode; + bool _requireConfirmation; const std::shared_ptr _show; const ComposeFeatures _features; Ui::RoundRect _overBg; diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp index 0ac62dd2e..793cf767c 100644 --- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp +++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp @@ -579,6 +579,7 @@ TabbedSelector::Tab TabbedSelector::createTab(SelectorTab type, int index) { .mode = (_mode == Mode::ChatIntro ? StickersMode::ChatIntro : StickersMode::Full), + .requireConfirmation = _mode != Mode::MediaEditor, .paused = paused, .st = &_st, .features = _features,