kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Revert "Don't attach menu callback to QAction lifetime."

Browse source 
This reverts commit 4093d6605a.
This commit is contained in:
John Preston 2022-04-25 15:46:52 +04:00
parent f128bd6d50
commit 2d7532bddd
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ui/widgets/menu/menu_common.cpp
View file

@ -6,9 +6,6 @@
// //
#include "ui/widgets/menu/menu_common.h" #include "ui/widgets/menu/menu_common.h"
#include "ui/ui_utility.h"
#include "base/invoke_queued.h"
#include <QAction> #include <QAction>
namespace Ui::Menu { namespace Ui::Menu {
@ -18,11 +15,12 @@ not_null<QAction*> CreateAction(
const QString &text, const QString &text,
Fn<void()> &&callback) { Fn<void()> &&callback) {
const auto action = new QAction(text, parent); const auto action = new QAction(text, parent);
const auto guard = MakeWeak(parent); parent->connect(
auto triggered = [guard, callback = std::move(callback)]() mutable { action,
InvokeQueued(guard, std::move(callback)); &QAction::triggered,
}; action,
parent->connect(action, &QAction::triggered, std::move(triggered)); std::move(callback),
Qt::QueuedConnection);
return action; return action;
} }