void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed emoji packs menu item.

Browse source
This commit is contained in:
John Preston 2022-08-18 18:09:57 +03:00
parent 8d2ebdbb99
commit b648387e96
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/SourceFiles/history/view/history_view_context_menu.cpp
View file

@ -1333,7 +1333,7 @@ void AddEmojiPacksAction(
menu->addSeparator(); menu->addSeparator();
} }
auto button = base::make_unique_q<Item>( auto button = base::make_unique_q<Item>(
menu, menu->menu(),
menu->st().menu, menu->st().menu,
(name.text.isEmpty() (name.text.isEmpty()
? tr::lng_context_animated_emoji_many( ? tr::lng_context_animated_emoji_many(

4
Telegram/SourceFiles/history/view/history_view_react_selector.cpp
View file

@ -138,7 +138,7 @@ int PopupSelector::countWidth(int desiredWidth, int maxWidth) {
int(_reactions.recent.size()) + (added ? 1 : 0)); int(_reactions.recent.size()) + (added ? 1 : 0));
_small = (possibleColumns - _columns > 1); _small = (possibleColumns - _columns > 1);
_recentRows = (_reactions.recent.size() + _columns - 1) / _columns; _recentRows = (_reactions.recent.size() + _columns - 1) / _columns;
return 2 * _skipx + _columns * _size; return std::max(2 * _skipx + _columns * _size, desiredWidth);
} }
QMargins PopupSelector::extentsForShadow() const { QMargins PopupSelector::extentsForShadow() const {
@ -291,7 +291,7 @@ bool AdjustMenuGeometryForSelector(
not_null<PopupSelector*> selector) { not_null<PopupSelector*> selector) {
const auto extend = st::reactStripExtend; const auto extend = st::reactStripExtend;
const auto added = extend.left() + extend.right(); const auto added = extend.left() + extend.right();
const auto desiredWidth = menu->width() + added; const auto desiredWidth = menu->menu()->width() + added;
const auto maxWidth = menu->st().menu.widthMax + added; const auto maxWidth = menu->st().menu.widthMax + added;
const auto width = selector->countWidth(desiredWidth, maxWidth); const auto width = selector->countWidth(desiredWidth, maxWidth);
const auto extents = selector->extentsForShadow(); const auto extents = selector->extentsForShadow();