diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 1915a6cae0..b8543d48f7 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -4529,6 +4529,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_add_tag_phrase" = "to messages {arrow}"; "lng_add_tag_phrase_long" = "to your Saved Messages {arrow}"; "lng_unlock_tags" = "Unlock"; +"lng_add_tag_selector#one" = "You can add a tag to the message"; +"lng_add_tag_selector#other" = "You can add a tag to the messages"; "lng_context_animated_emoji" = "This message contains emoji from **{name} pack**."; "lng_context_animated_emoji_many#one" = "This message contains emoji from **{count} pack**."; diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style index 2931d8f430..ba4a07b5a6 100644 --- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style +++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style @@ -815,7 +815,7 @@ reactPanelScrollRounded: ScrollArea(emojiScroll) { deltat: 14px; deltab: 14px; } -selfForwardsTaggerStripSkip: 46px; +selfForwardsTaggerStripSkip: 26px; selfForwardsTaggerIcon: size(32px, 32px); selfForwardsTaggerToast: Toast(defaultToast) { minWidth: 160px; diff --git a/Telegram/SourceFiles/history/view/history_view_self_forwards_tagger.cpp b/Telegram/SourceFiles/history/view/history_view_self_forwards_tagger.cpp index 11a109d2c3..e0bfc59a55 100644 --- a/Telegram/SourceFiles/history/view/history_view_self_forwards_tagger.cpp +++ b/Telegram/SourceFiles/history/view/history_view_self_forwards_tagger.cpp @@ -107,7 +107,11 @@ void SelfForwardsTagger::showSelectorForMessages( st::reactPanelEmojiPan, _controller->uiShow(), reactions, - TextWithEntities(), + tr::lng_add_tag_selector( + tr::now, + lt_count, + float64(ids.size()), + TextWithEntities::Simple), [](bool) {}, IconFactory(), [] { return false; }, 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 edae5f7d75..0b360904a0 100644 --- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp +++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp @@ -499,7 +499,10 @@ void Selector::initGeometry(int innerTop) { if (_about) { _about->move( _inner.x() + (_inner.width() - _about->width()) / 2, - _outer.y() + margins.top() + _st.aboutPadding.top()); + _outer.y() + + margins.top() + + _st.aboutPadding.top() + - skipYBubbleUpShift()); _aboutCache = Ui::GrabWidgetToImage(_about.get()); }