From 4b7a6b82c079ec4612d2704fc5152590e607778d Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Fri, 27 Aug 2021 02:07:09 +0300 Subject: [PATCH] Allow sending inline result preview in scheduled messages --- .../chat_helpers/send_context_menu.cpp | 22 +++++++++++-------- .../chat_helpers/send_context_menu.h | 1 + .../view/history_view_scheduled_section.cpp | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Telegram/SourceFiles/chat_helpers/send_context_menu.cpp b/Telegram/SourceFiles/chat_helpers/send_context_menu.cpp index 9d80b58b5..73914b073 100644 --- a/Telegram/SourceFiles/chat_helpers/send_context_menu.cpp +++ b/Telegram/SourceFiles/chat_helpers/send_context_menu.cpp @@ -49,6 +49,7 @@ FillMenuResult FillSendMenu( } const auto now = type; if (now == Type::Disabled + || now == Type::PreviewOnly || (!silent && now == Type::SilentOnly)) { return FillMenuResult::None; } @@ -83,15 +84,17 @@ FillMenuResult FillSendPreviewMenu( if (defaultSend) { menu->addAction(ktr("ktg_send_preview"), defaultSend); } - if (silent && now != Type::Reminder) { - menu->addAction(ktr("ktg_send_silent_preview"), silent); - } - if (schedule && now != Type::SilentOnly) { - menu->addAction( - (now == Type::Reminder - ? ktr("ktg_reminder_preview") - : ktr("ktg_schedule_preview")), - schedule); + if (type != Type::PreviewOnly) { + if (silent && now != Type::Reminder) { + menu->addAction(ktr("ktg_send_silent_preview"), silent); + } + if (schedule && now != Type::SilentOnly) { + menu->addAction( + (now == Type::Reminder + ? ktr("ktg_reminder_preview") + : ktr("ktg_schedule_preview")), + schedule); + } } return FillMenuResult::Success; } @@ -127,6 +130,7 @@ void SetupMenuAndShortcuts( const auto now = type(); if (now == Type::Disabled + || now == Type::PreviewOnly || (!silent && now == Type::SilentOnly)) { return; } diff --git a/Telegram/SourceFiles/chat_helpers/send_context_menu.h b/Telegram/SourceFiles/chat_helpers/send_context_menu.h index a7662ebcc..4d933600b 100644 --- a/Telegram/SourceFiles/chat_helpers/send_context_menu.h +++ b/Telegram/SourceFiles/chat_helpers/send_context_menu.h @@ -25,6 +25,7 @@ enum class Type { Scheduled, ScheduledToUser, // For "Send when online". Reminder, + PreviewOnly, }; enum class FillMenuResult { diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp index cfdc08e07..93a01a828 100644 --- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp +++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp @@ -99,7 +99,7 @@ ScheduledWidget::ScheduledWidget( this, controller, ComposeControls::Mode::Scheduled, - SendMenu::Type::Disabled)) + SendMenu::Type::PreviewOnly)) , _scrollDown(_scroll, st::historyToDown) { const auto state = Dialogs::EntryState{ .key = _history,