void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-04-16 22:27:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Divided showing of peer menu from top bar into two methods.

Browse source
This commit is contained in:
23rd 2022-02-26 07:07:07 +03:00
parent a3d00b1953
commit 166d844d55
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
View file

@ -107,7 +107,7 @@ TopBarWidget::TopBarWidget(
_call->setClickedCallback([=] { call(); });
_groupCall->setClickedCallback([=] { groupCall(); });
_search->setClickedCallback([=] { search(); });
_menuToggle->setClickedCallback([=] { showMenu(); });
_menuToggle->setClickedCallback([=] { showPeerMenu(); });
_infoToggle->setClickedCallback([=] { toggleInfoSection(); });
_back->addClickHandler([=] { backClicked(); });
_cancelChoose->setClickedCallback(
@ -272,9 +272,9 @@ void TopBarWidget::setChooseForReportReason(
: style::cur_default);
}
void TopBarWidget::showMenu() {
bool TopBarWidget::createMenu() {
if (!_activeChat.key || _menu) {
return;
return false;
}
_menu.create(parentWidget(), st::dropdownMenuWithIcons);
_menu->setHiddenCallback([weak = Ui::MakeWeak(this), menu = _menu.data()]{
@ -295,20 +295,27 @@ void TopBarWidget::showMenu() {
}
}));
_menuToggle->installEventFilter(_menu);
return true;
}
void TopBarWidget::showPeerMenu() {
const auto created = createMenu();
if (!created) {
return;
}
const auto addAction = [&](
const QString &text,
Fn<void()> callback,
const style::icon *icon) {
return _menu->addAction(text, std::move(callback), icon);
};
Window::FillDialogsEntryMenu(
_controller,
_activeChat,
addAction);
Window::FillDialogsEntryMenu(_controller, _activeChat, addAction);
if (_menu->empty()) {
_menu.destroy();
} else {
_menu->moveToRight((parentWidget()->width() - width()) + st::topBarMenuPosition.x(), st::topBarMenuPosition.y());
_menu->moveToRight(
(parentWidget()->width() - width()) + st::topBarMenuPosition.x(),
st::topBarMenuPosition.y());
_menu->showAnimated(Ui::PanelAnimation::Origin::TopRight);
}
}

4
Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
View file

@ -109,9 +109,11 @@ private:
void groupCall();
void startGroupCall(not_null<ChannelData*> megagroup, bool confirmed);
void search();
void showMenu();
void showPeerMenu();
void toggleInfoSection();
[[nodiscard]] bool createMenu();
void handleEmojiInteractionSeen(const QString &emoticon);
bool paintSendAction(
Painter &p,