kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Allow custom separators in menu-add-action-callback.

Browse source
This commit is contained in:
John Preston 2024-04-11 16:09:57 +04:00
parent 2385fb30b5
commit d2420c6bf8
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ui/widgets/menu/menu_add_action_callback.h
View file

@ -8,6 +8,10 @@
#include "ui/style/style_core.h" #include "ui/style/style_core.h"
namespace style {
struct MenuSeparator;
} // namespace style
namespace Ui { namespace Ui {
class PopupMenu; class PopupMenu;
} // namespace Ui } // namespace Ui
@ -20,6 +24,7 @@ public:
QString text; QString text;
Fn<void()> handler; Fn<void()> handler;
const style::icon *icon; const style::icon *icon;
const style::MenuSeparator *separatorSt = nullptr;
Fn<void(not_null<Ui::PopupMenu*>)> fillSubmenu; Fn<void(not_null<Ui::PopupMenu*>)> fillSubmenu;
int addTopShift = 0; int addTopShift = 0;
bool isSeparator = false; bool isSeparator = false;

4
ui/widgets/menu/menu_add_action_callback_factory.cpp
View file

@ -27,8 +27,8 @@ MenuCallback CreateAddActionCallback(not_null<Ui::PopupMenu*> menu) {
action->setMenu(Ui::CreateChild<QMenu>(menu->menu().get())); action->setMenu(Ui::CreateChild<QMenu>(menu->menu().get()));
a.fillSubmenu(menu->ensureSubmenu(action, menu->st())); a.fillSubmenu(menu->ensureSubmenu(action, menu->st()));
return action; return action;
} else if (a.isSeparator) { } else if (a.separatorSt || a.isSeparator) {
return menu->addSeparator(); return menu->addSeparator(a.separatorSt);
} else if (a.isAttention) { } else if (a.isAttention) {
return menu->addAction(base::make_unique_q<Ui::Menu::Action>( return menu->addAction(base::make_unique_q<Ui::Menu::Action>(
menu, menu,