kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Removed redundant argument from action menu item constructor.

Browse source
This commit is contained in:
23rd 2021-01-13 18:20:08 +03:00
parent 0c5135f671
commit 3640f69369
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -88,8 +88,7 @@ not_null<QAction*> Menu::addAction(
_st,
std::move(action),
icon,
iconOver ? iconOver : icon,
(action->menu() != nullptr));
iconOver ? iconOver : icon);
return addAction(std::move(item));
}

5
ui/widgets/menu/menu_action.cpp
View file

@ -51,8 +51,7 @@ Action::Action(
const style::Menu &st,
not_null<QAction*> action,
const style::icon *icon,
const style::icon *iconOver,
bool hasSubmenu)
const style::icon *iconOver)
: ItemBase(parent, st)
, _action(action)
, _st(st)
@ -64,7 +63,7 @@ Action::Action(
initResizeHook(parent->sizeValue());
processAction();
setHasSubmenu(hasSubmenu);
setHasSubmenu(action->menu() != nullptr);
paintRequest(
) | rpl::start_with_next([=] {

3
ui/widgets/menu/menu_action.h
View file

@ -21,8 +21,7 @@ public:
const style::Menu &st,
not_null<QAction*> action,
const style::icon *icon,
const style::icon *iconOver,
bool hasSubmenu);
const style::icon *iconOver);
bool isEnabled() const override;
QAction *action() const override;