RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replaced Window::PeerMenuCallback with struct.

This commit is contained in:
23rd 2022-03-28 15:30:40 +03:00 committed by John Preston
parent d8ee50c6fe
commit c520cb777c
7 changed files with 56 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
View File

@ -1771,6 +1771,10 @@ void InnerWidget::contextMenuEvent(QContextMenuEvent *e) {
fillArchiveSearchMenu(_menu.get());
}
} else {
const auto addAction = Window::PeerMenuCallback([&](
Window::PeerMenuCallback::Args &&a) {
return _menu->addAction(a.text, std::move(a.handler), a.icon);
});
Window::FillDialogsEntryMenu(
_controller,
Dialogs::EntryState{
@ -1778,12 +1782,7 @@ void InnerWidget::contextMenuEvent(QContextMenuEvent *e) {
.section = Dialogs::EntryState::Section::ChatsList,
.filterId = _filterId,
},
[&](
const QString &text,
Fn<void()> callback,
const style::icon *icon) {
return _menu->addAction(text, std::move(callback), icon);
});
addAction);
}
QObject::connect(_menu.get(), &QObject::destroyed, [=] {
if (_menuRow.key) {

10
Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
View File

@ -315,12 +315,10 @@ void TopBarWidget::showPeerMenu() {
if (!created) {
return;
}
const auto addAction = [&](
const QString &text,
Fn<void()> callback,
const style::icon *icon) {
return _menu->addAction(text, std::move(callback), icon);
};
const auto addAction = Window::PeerMenuCallback([&](
Window::PeerMenuCallback::Args a) {
return _menu->addAction(a.text, std::move(a.handler), a.icon);
});
Window::FillDialogsEntryMenu(_controller, _activeChat, addAction);
if (_menu->empty()) {
_menu.destroy();

10
Telegram/SourceFiles/info/info_wrap_widget.cpp
View File

@ -515,12 +515,10 @@ void WrapWidget::showTopBarMenu() {
});
_topBarMenuToggle->installEventFilter(_topBarMenu.get());
const auto addAction = [=](
const QString &text,
Fn<void()> callback,
const style::icon *icon) {
return _topBarMenu->addAction(text, std::move(callback), icon);
};
const auto addAction = Window::PeerMenuCallback([=](
Window::PeerMenuCallback::Args a) {
return _topBarMenu->addAction(a.text, std::move(a.handler), a.icon);
});
if (key().isDownloads()) {
addAction(
tr::lng_context_delete_all_files(tr::now),

14
Telegram/SourceFiles/settings/settings_information.cpp
View File

@ -546,15 +546,13 @@ void SetupAccountsWrap(
} else if (which != Qt::RightButton) {
return;
}
const auto addAction = [&](
const QString &text,
Fn<void()> callback,
const style::icon *icon) {
const auto addAction = Window::PeerMenuCallback([&](
Window::PeerMenuCallback::Args args) {
return state->menu->addAction(
text,
crl::guard(raw, std::move(callback)),
icon);
};
args.text,
crl::guard(raw, std::move(args.handler)),
args.icon);
});
if (!state->menu && IsAltShift(raw->clickModifiers())) {
state->menu = base::make_unique_q<Ui::PopupMenu>(
raw,

14
Telegram/SourceFiles/window/window_filters_menu.cpp
View File

@ -310,15 +310,13 @@ void FiltersMenu::showMenu(QPoint position, FilterId id) {
_popupMenu = base::make_unique_q<Ui::PopupMenu>(
i->second.get(),
st::popupMenuWithIcons);
const auto addAction = [&](
const QString &text,
Fn<void()> callback,
const style::icon *icon) {
const auto addAction = Window::PeerMenuCallback([&](
Window::PeerMenuCallback::Args args) {
return _popupMenu->addAction(
text,
crl::guard(&_outer, std::move(callback)),
icon);
};
args.text,
crl::guard(&_outer, std::move(args.handler)),
args.icon);
});
addAction(
tr::lng_filters_context_edit(tr::now),

14
Telegram/SourceFiles/window/window_main_menu.cpp
View File

@ -475,15 +475,13 @@ void MainMenu::setupArchive() {
_contextMenu = base::make_unique_q<Ui::PopupMenu>(
this,
st::popupMenuWithIcons);
const auto addAction = [&](
const QString &text,
Fn<void()> callback,
const style::icon *icon) {
const auto addAction = PeerMenuCallback([&](
PeerMenuCallback::Args a) {
return _contextMenu->addAction(
text,
std::move(callback),
icon);
};
a.text,
std::move(a.handler),
a.icon);
});
const auto hide = [=] {
controller->session().settings().setArchiveInMainMenu(false);

29
Telegram/SourceFiles/window/window_peer_menu.h
View File

@ -38,10 +38,31 @@ class SessionNavigation;
extern const char kOptionViewProfileInChatsListContextMenu[];
using PeerMenuCallback = Fn<QAction*(
const QString &text,
Fn<void()> handler,
const style::icon *icon)>;
struct PeerMenuCallback {
public:
struct Args {
const QString &text;
Fn<void()> handler;
const style::icon *icon;
};
using Callback = Fn<QAction*(Args&&)>;
explicit PeerMenuCallback(Callback callback)
: callback(std::move(callback)) {
}
QAction *operator()(Args &&args) const {
return callback(std::move(args));
}
QAction *operator()(
const QString &text,
Fn<void()> handler,
const style::icon *icon) const {
return callback({ text, std::move(handler), icon });
}
private:
Callback callback;
};
void FillDialogsEntryMenu(
not_null<SessionController*> controller,