Moved mouse selecting of menu items to menu base item.

ui/widgets/menu/menu_action.cpp

@@ -71,23 +71,7 @@ Action::Action(
 		paint(p);
 	}, lifetime());
 
-	events(
+	enableMouseSelecting();
-	) | rpl::filter([=](not_null<QEvent*> e) {
-		return _action->isEnabled()
-			&& ((e->type() == QEvent::Leave)
-				|| (e->type() == QEvent::Enter));
-	}) | rpl::map([=](not_null<QEvent*> e) {
-		return (e->type() == QEvent::Enter);
-	}) | rpl::start_with_next([=](bool selected) {
-		setSelected(selected);
-	}, lifetime());
-
-	events(
-	) | rpl::filter([=](not_null<QEvent*> e) {
-		return _action->isEnabled() && (e->type() == QEvent::MouseMove);
-	}) | rpl::start_with_next([=](not_null<QEvent*> e) {
-		setSelected(true);
-	}, lifetime());
 
 	connect(_action, &QAction::changed, [=] { processAction(); });
 }

ui/widgets/menu/menu_item_base.cpp

@@ -115,4 +115,17 @@ void ItemBase::finishAnimating() {
 	RippleButton::finishAnimating();
 }
 
+void ItemBase::enableMouseSelecting() {
+	events(
+	) | rpl::filter([=](not_null<QEvent*> e) {
+		return action()->isEnabled()
+			&& ((e->type() == QEvent::Leave)
+				|| (e->type() == QEvent::Enter));
+	}) | rpl::map([=](not_null<QEvent*> e) {
+		return (e->type() == QEvent::Enter);
+	}) | rpl::start_with_next([=](bool selected) {
+		setSelected(selected);
+	}, lifetime());
+}
+
 } // namespace Ui::Menu

ui/widgets/menu/menu_item_base.h

@@ -48,6 +48,8 @@ protected:
 	void init();
 	void initResizeHook(rpl::producer<QSize> &&size);
 
+	void enableMouseSelecting();
+
 	virtual int contentHeight() const = 0;
 
 private: