From a197245574f31d5812b107b754b2ab8e93dda873 Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Thu, 17 Feb 2022 05:25:37 +0300 Subject: [PATCH] Removed "Emoji panel on hover" option It was replaced by "Show tabbed panel by click" experimental option from TDesktop. --- Telegram/Resources/langs/rewrites/en.json | 1 - Telegram/Resources/langs/rewrites/ru.json | 1 - Telegram/SourceFiles/history/history_widget.cpp | 13 +------------ .../controls/history_view_compose_controls.cpp | 15 +-------------- Telegram/SourceFiles/kotato/kotato_settings.cpp | 3 --- .../SourceFiles/kotato/kotato_settings_menu.cpp | 2 -- 6 files changed, 2 insertions(+), 33 deletions(-) diff --git a/Telegram/Resources/langs/rewrites/en.json b/Telegram/Resources/langs/rewrites/en.json index dfed0f314..6f709d68c 100644 --- a/Telegram/Resources/langs/rewrites/en.json +++ b/Telegram/Resources/langs/rewrites/en.json @@ -132,7 +132,6 @@ "ktg_settings_chat_id_telegram": "Telegram API", "ktg_settings_chat_id_bot": "Bot API", "ktg_message_id": "Message ID: {id}", - "ktg_emoji_panel_hover": "Emoji panel on hover", "ktg_local_storage_limit_days": { "zero": "{count} days", "one": "{count} day", diff --git a/Telegram/Resources/langs/rewrites/ru.json b/Telegram/Resources/langs/rewrites/ru.json index 500485168..178765130 100644 --- a/Telegram/Resources/langs/rewrites/ru.json +++ b/Telegram/Resources/langs/rewrites/ru.json @@ -132,7 +132,6 @@ "ktg_settings_chat_id_telegram": "Telegram API", "ktg_settings_chat_id_bot": "Bot API", "ktg_message_id": "ID сообщения: {id}", - "ktg_emoji_panel_hover": "Панель эмодзи по наведению", "ktg_local_storage_limit_days": { "zero": "{count} дней", "one": "{count} дня", diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index cd2db8800..6a566d2cf 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -682,14 +682,6 @@ HistoryWidget::HistoryWidget( }); }, lifetime()); - ::Kotato::JsonSettings::Events( - "hover_emoji_panel" - ) | rpl::start_with_next([=] { - crl::on_main(this, [=] { - refreshTabbedPanel(); - }); - }, lifetime()); - session().data().animationPlayInlineRequest( ) | rpl::start_with_next([=](not_null item) { if (const auto view = item->mainView()) { @@ -1135,9 +1127,7 @@ void HistoryWidget::initTabbedSelector() { }); base::install_event_filter(_tabbedSelectorToggle, [=](not_null e) { - if (e->type() == QEvent::ContextMenu - && !::Kotato::JsonSettings::GetBool("hover_emoji_panel") - && _tabbedPanel) { + if (e->type() == QEvent::ContextMenu && _tabbedPanel) { _tabbedPanel->toggleAnimated(); return base::EventFilterResult::Cancel; } @@ -4757,7 +4747,6 @@ void HistoryWidget::createTabbedPanel() { void HistoryWidget::setTabbedPanel(std::unique_ptr panel) { _tabbedPanel = std::move(panel); if (const auto raw = _tabbedPanel.get()) { - _tabbedPanel->setPreventHover(!::Kotato::JsonSettings::GetBool("hover_emoji_panel")); _tabbedSelectorToggle->installEventFilter(raw); _tabbedSelectorToggle->setColorOverrides(nullptr, nullptr, nullptr); } 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 d4ae994a8..5f8a82973 100644 --- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp +++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp @@ -1075,16 +1075,6 @@ void ComposeControls::init() { }, _wrap->lifetime()); } - ::Kotato::JsonSettings::Events( - "hover_emoji_panel" - ) | rpl::start_with_next([=] { - if (_window->hasTabbedSelectorOwnership()) { - createTabbedPanel(); - } else { - setTabbedPanel(nullptr); - } - }, _wrap->lifetime()); - orderControls(); } @@ -1577,9 +1567,7 @@ void ComposeControls::initTabbedSelector() { } base::install_event_filter(_tabbedSelectorToggle, [=](not_null e) { - if (e->type() == QEvent::ContextMenu - && !::Kotato::JsonSettings::GetBool("hover_emoji_panel") - && _tabbedPanel) { + if (e->type() == QEvent::ContextMenu && _tabbedPanel) { _tabbedPanel->toggleAnimated(); return base::EventFilterResult::Cancel; } @@ -2059,7 +2047,6 @@ void ComposeControls::setTabbedPanel( std::unique_ptr panel) { _tabbedPanel = std::move(panel); if (const auto raw = _tabbedPanel.get()) { - _tabbedPanel->setPreventHover(!::Kotato::JsonSettings::GetBool("hover_emoji_panel")); _tabbedSelectorToggle->installEventFilter(raw); _tabbedSelectorToggle->setColorOverrides(nullptr, nullptr, nullptr); } else { diff --git a/Telegram/SourceFiles/kotato/kotato_settings.cpp b/Telegram/SourceFiles/kotato/kotato_settings.cpp index fba30902b..882f3409f 100644 --- a/Telegram/SourceFiles/kotato/kotato_settings.cpp +++ b/Telegram/SourceFiles/kotato/kotato_settings.cpp @@ -425,9 +425,6 @@ const std::map> DefinitionMap { { "profile_top_mute", { .type = SettingType::BoolSetting, .defaultValue = false, }}, - { "hover_emoji_panel", { - .type = SettingType::BoolSetting, - .defaultValue = true, }}, { "forward_retain_selection", { .type = SettingType::BoolSetting, .defaultValue = false, }}, diff --git a/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp b/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp index 1ca0c8c80..83ab345d3 100644 --- a/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp +++ b/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp @@ -295,8 +295,6 @@ void SetupKotatoChats( ::Kotato::JsonSettings::Write(); }, container->lifetime()); - SettingsMenuJsonSwitch(ktg_emoji_panel_hover, hover_emoji_panel); - AddButton( container, rktr("ktg_settings_fonts"),