diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp index feb425051..aed682aeb 100644 --- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp +++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp @@ -945,6 +945,9 @@ AttachSelectorResult MakeJustSelectorMenu( if (!AdjustMenuGeometryForSelector(menu, desiredPosition, selector)) { return AttachSelectorResult::Failed; } + if (mode != ChatHelpers::EmojiListMode::RecentReactions) { + Ui::Platform::FixPopupMenuNativeEmojiPopup(menu); + } const auto selectorInnerTop = menu->preparedPadding().top() - st::reactStripExtend.top(); menu->animatePhaseValue( @@ -1006,6 +1009,7 @@ AttachSelectorResult AttachSelectorToMenu( if (reactions.recent.empty() && !reactions.morePremiumAvailable) { return AttachSelectorResult::Skipped; } + const auto withSearch = reactions.customAllowed; const auto selector = Ui::CreateChild( menu.get(), controller, @@ -1015,6 +1019,9 @@ AttachSelectorResult AttachSelectorToMenu( if (!AdjustMenuGeometryForSelector(menu, desiredPosition, selector)) { return AttachSelectorResult::Failed; } + if (withSearch) { + Ui::Platform::FixPopupMenuNativeEmojiPopup(menu); + } const auto selectorInnerTop = selector->useTransparency() ? (menu->preparedPadding().top() - st::reactStripExtend.top()) : st::lineWidth; diff --git a/Telegram/lib_ui b/Telegram/lib_ui index bcb56492c..328b75a31 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit bcb56492c4cab204b8b27d762586e4bdbcc6c074 +Subproject commit 328b75a311cd8f50c2b75dfefa7443e6eafcb9e1