kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Added ability to fill menu with custom widgets.

Browse source
This commit is contained in:
23rd 2021-01-13 18:17:27 +03:00
parent 497452250a
commit 0c5135f671
6 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ui/widgets/dropdown_menu.cpp
View file

@ -53,6 +53,11 @@ void DropdownMenu::init() {
hide(); hide();
} }
not_null<QAction*> DropdownMenu::addAction(
base::unique_qptr<Menu::ItemBase> widget) {
return _menu->addAction(std::move(widget));
}
not_null<QAction*> DropdownMenu::addAction(const QString &text, Fn<void()> callback, const style::icon *icon, const style::icon *iconOver) { not_null<QAction*> DropdownMenu::addAction(const QString &text, Fn<void()> callback, const style::icon *icon, const style::icon *iconOver) {
return _menu->addAction(text, std::move(callback), icon, iconOver); return _menu->addAction(text, std::move(callback), icon, iconOver);
} }

1
ui/widgets/dropdown_menu.h
View file

@ -18,6 +18,7 @@ class DropdownMenu : public InnerDropdown {
public: public:
DropdownMenu(QWidget *parent, const style::DropdownMenu &st = st::defaultDropdownMenu); DropdownMenu(QWidget *parent, const style::DropdownMenu &st = st::defaultDropdownMenu);
not_null<QAction*> addAction(base::unique_qptr<Menu::ItemBase> widget);
not_null<QAction*> addAction(const QString &text, Fn<void()> callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); not_null<QAction*> addAction(const QString &text, Fn<void()> callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr);
not_null<QAction*> addSeparator(); not_null<QAction*> addSeparator();
void clearActions(); void clearActions();

2
ui/widgets/menu/menu.cpp
View file

@ -97,6 +97,8 @@ not_null<QAction*> Menu::addAction(base::unique_qptr<ItemBase> widget) {
const auto action = widget->action(); const auto action = widget->action();
_actions.emplace_back(action); _actions.emplace_back(action);
widget->setParent(this);
const auto top = _actionWidgets.empty() const auto top = _actionWidgets.empty()
? 0 ? 0
: _actionWidgets.back()->y() + _actionWidgets.back()->height(); : _actionWidgets.back()->y() + _actionWidgets.back()->height();

4
ui/widgets/menu/menu.h
View file

@ -16,7 +16,7 @@
namespace Ui::Menu { namespace Ui::Menu {
class ItemBase; class ItemBase;
class ToggleView; //class ToggleView;
class RippleAnimation; class RippleAnimation;
class Menu : public RpWidget { class Menu : public RpWidget {
@ -25,6 +25,7 @@ public:
Menu(QWidget *parent, QMenu *menu, const style::Menu &st = st::defaultMenu); Menu(QWidget *parent, QMenu *menu, const style::Menu &st = st::defaultMenu);
~Menu(); ~Menu();
not_null<QAction*> addAction(base::unique_qptr<ItemBase> widget);
not_null<QAction*> addAction( not_null<QAction*> addAction(
const QString &text, const QString &text,
Fn<void()> callback, Fn<void()> callback,
@ -90,7 +91,6 @@ private:
not_null<QAction*> action, not_null<QAction*> action,
const style::icon *icon = nullptr, const style::icon *icon = nullptr,
const style::icon *iconOver = nullptr); const style::icon *iconOver = nullptr);
not_null<QAction*> addAction(base::unique_qptr<ItemBase> widget);
void setSelected(int selected); void setSelected(int selected);
void clearMouseSelection(); void clearMouseSelection();

5
ui/widgets/popup_menu.cpp
View file

@ -91,6 +91,11 @@ void PopupMenu::handleMenuResize() {
_inner = rect().marginsRemoved(_padding); _inner = rect().marginsRemoved(_padding);
} }
not_null<QAction*> PopupMenu::addAction(
base::unique_qptr<Menu::ItemBase> widget) {
return _menu->addAction(std::move(widget));
}
not_null<QAction*> PopupMenu::addAction(const QString &text, Fn<void()> callback, const style::icon *icon, const style::icon *iconOver) { not_null<QAction*> PopupMenu::addAction(const QString &text, Fn<void()> callback, const style::icon *icon, const style::icon *iconOver) {
return _menu->addAction(text, std::move(callback), icon, iconOver); return _menu->addAction(text, std::move(callback), icon, iconOver);
} }

1
ui/widgets/popup_menu.h
View file

@ -21,6 +21,7 @@ public:
PopupMenu(QWidget *parent, const style::PopupMenu &st = st::defaultPopupMenu); PopupMenu(QWidget *parent, const style::PopupMenu &st = st::defaultPopupMenu);
PopupMenu(QWidget *parent, QMenu *menu, const style::PopupMenu &st = st::defaultPopupMenu); PopupMenu(QWidget *parent, QMenu *menu, const style::PopupMenu &st = st::defaultPopupMenu);
not_null<QAction*> addAction(base::unique_qptr<Menu::ItemBase> widget);
not_null<QAction*> addAction(const QString &text, Fn<void()> callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); not_null<QAction*> addAction(const QString &text, Fn<void()> callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr);
not_null<QAction*> addAction(const QString &text, std::unique_ptr<PopupMenu> submenu); not_null<QAction*> addAction(const QString &text, std::unique_ptr<PopupMenu> submenu);
not_null<QAction*> addSeparator(); not_null<QAction*> addSeparator();