From 9565276915d43e0936e836717512ee3d40f77bfe Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Thu, 30 Jul 2020 16:51:04 +0300 Subject: [PATCH] Switch tabbed emoji panel by RMB if disabled by hover --- Telegram/SourceFiles/history/history_widget.cpp | 8 ++++++++ .../history/view/history_view_compose_controls.cpp | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index 8b250be65..fb77fc32c 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -876,6 +876,14 @@ void HistoryWidget::initTabbedSelector() { toggleTabbedSelectorMode(); }); + base::install_event_filter(_tabbedSelectorToggle, [=](not_null e) { + if (e->type() == QEvent::ContextMenu && !HoverEmojiPanel()) { + _tabbedPanel->toggleAnimated(); + return base::EventFilterResult::Cancel; + } + return base::EventFilterResult::Continue; + }); + const auto selector = controller()->tabbedSelector(); base::install_event_filter(this, selector, [=](not_null e) { diff --git a/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp index 3e556a056..b6b544aa5 100644 --- a/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp +++ b/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp @@ -673,6 +673,14 @@ void ComposeControls::initTabbedSelector() { setTabbedPanel(nullptr); } + base::install_event_filter(_tabbedSelectorToggle, [=](not_null e) { + if (e->type() == QEvent::ContextMenu && !HoverEmojiPanel()) { + _tabbedPanel->toggleAnimated(); + return base::EventFilterResult::Cancel; + } + return base::EventFilterResult::Continue; + }); + _tabbedSelectorToggle->addClickHandler([=] { toggleTabbedSelectorMode(); });