diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp index 42c15a6b0..526298c00 100644 --- a/Telegram/SourceFiles/history/history_inner_widget.cpp +++ b/Telegram/SourceFiles/history/history_inner_widget.cpp @@ -1861,17 +1861,6 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) { } }; - if (hasWhoReadItem) { - const auto participantChosen = [=](uint64 id) { - controller->showPeerInfo(PeerId(id)); - }; - _menu->addAction(Ui::WhoReadContextAction( - _menu.get(), - Api::WhoRead(_dragStateItem, this, st::defaultWhoRead), - participantChosen)); - _menu->addSeparator(); - } - const auto link = ClickHandler::getActive(); auto lnkPhoto = dynamic_cast(link.get()); auto lnkDocument = dynamic_cast(link.get()); @@ -2090,6 +2079,19 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) { } } + if (hasWhoReadItem) { + const auto participantChosen = [=](uint64 id) { + controller->showPeerInfo(PeerId(id)); + }; + if (!_menu->empty()) { + _menu->addSeparator(); + } + _menu->addAction(Ui::WhoReadContextAction( + _menu.get(), + Api::WhoRead(_dragStateItem, this, st::defaultWhoRead), + participantChosen)); + } + if (_menu->empty()) { _menu = nullptr; } else { diff --git a/Telegram/SourceFiles/history/view/history_view_reactions.cpp b/Telegram/SourceFiles/history/view/history_view_reactions.cpp index 500d7470f..059954855 100644 --- a/Telegram/SourceFiles/history/view/history_view_reactions.cpp +++ b/Telegram/SourceFiles/history/view/history_view_reactions.cpp @@ -60,6 +60,7 @@ void InlineList::layoutButtons() { _buttons.clear(); return; } + _data.chosenReaction; auto sorted = ranges::view::all( _data.reactions ) | ranges::view::transform([](const auto &pair) { diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style index b06f91821..965c71670 100644 --- a/Telegram/SourceFiles/ui/chat/chat.style +++ b/Telegram/SourceFiles/ui/chat/chat.style @@ -903,14 +903,15 @@ defaultWhoRead: WhoRead { photoSize: 30px; photoSkip: 5px; nameLeft: 57px; - iconPosition: point(10px, 7px); - itemPadding: margins(41px, 9px, 17px, 7px); + iconPosition: point(15px, 7px); + itemPadding: margins(44px, 9px, 17px, 7px); } whoReadMenu: PopupMenu(popupMenuWithIcons) { - scrollPadding: margins(0px, 6px, 0px, 6px); + scrollPadding: margins(0px, 6px, 0px, 4px); maxHeight: 387px; menu: Menu(menuWithIcons) { - separatorPadding: margins(0px, 6px, 0px, 5px); + separatorPadding: margins(0px, 4px, 0px, 4px); + separatorWidth: 6px; } } whoReadChecks: icon{{ "menu/read_ticks", menuSubmenuArrowFg }}; diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style index 3a9e81552..79e19fbbc 100644 --- a/Telegram/SourceFiles/ui/menu_icons.style +++ b/Telegram/SourceFiles/ui/menu_icons.style @@ -10,7 +10,7 @@ using "ui/widgets/widgets.style"; menuWithIcons: Menu(defaultMenu) { itemIconPosition: point(15px, 5px); - itemPadding: margins(56px, 8px, 17px, 8px); + itemPadding: margins(54px, 8px, 17px, 8px); } popupMenuWithIcons: PopupMenu(defaultPopupMenu) { scrollPadding: margins(0px, 5px, 0px, 5px);