Moved key press handling from menu to menu item base.

ui/widgets/dropdown_menu.cpp

@@ -134,9 +134,9 @@ bool DropdownMenu::popupSubmenuFromAction(const Menu::CallbackData &data) {
 //	}
 //}
 
-void DropdownMenu::forwardKeyPress(int key) {
-	if (!handleKeyPress(key)) {
-		_menu->handleKeyPress(key);
+void DropdownMenu::forwardKeyPress(not_null<QKeyEvent*> e) {
+	if (!handleKeyPress(e->key())) {
+		_menu->handleKeyPress(e);
 	}
 }
 
@@ -193,7 +193,7 @@ void DropdownMenu::hideEvent(QHideEvent *e) {
 }
 
 void DropdownMenu::keyPressEvent(QKeyEvent *e) {
-	forwardKeyPress(e->key());
+	forwardKeyPress(e);
 }
 
 void DropdownMenu::mouseMoveEvent(QMouseEvent *e) {

ui/widgets/dropdown_menu.h

@@ -59,7 +59,7 @@ private:
 	using TriggeredSource = Menu::TriggeredSource;
 	void handleActivated(const Menu::CallbackData &data);
 	void handleTriggered(const Menu::CallbackData &data);
-	void forwardKeyPress(int key);
+	void forwardKeyPress(not_null<QKeyEvent*> e);
 	bool handleKeyPress(int key);
 	void forwardMouseMove(QPoint globalPosition) {
 		_menu->handleMouseMove(globalPosition);

ui/widgets/menu/menu.cpp

@@ -229,7 +229,7 @@ void Menu::itemPressed(TriggeredSource source) {
 void Menu::keyPressEvent(QKeyEvent *e) {
 	const auto key = e->key();
 	if (!_keyPressDelegate || !_keyPressDelegate(key)) {
-		handleKeyPress(key);
+		handleKeyPress(e);
 	}
 }
 
@@ -238,26 +238,17 @@ ItemBase *Menu::findSelectedAction() const {
 	return (it == end(_actionWidgets)) ? nullptr : it->get();
 }
 
-void Menu::handleKeyPress(int key) {
-	if (key == Qt::Key_Enter || key == Qt::Key_Return) {
-		itemPressed(TriggeredSource::Keyboard);
-		return;
-	}
-	if (key == (style::RightToLeft() ? Qt::Key_Left : Qt::Key_Right)) {
-		if (_selected >= 0 && _actionWidgets[_selected]->hasSubmenu()) {
-			itemPressed(TriggeredSource::Keyboard);
-			return;
-		} else if (_selected < 0 && !_actions.empty()) {
-			_mouseSelection = false;
-			setSelected(0);
-		}
-	}
+void Menu::handleKeyPress(not_null<QKeyEvent*> e) {
+	const auto key = e->key();
+	const auto selected = findSelectedAction();
 	if ((key != Qt::Key_Up && key != Qt::Key_Down) || _actions.empty()) {
+		if (selected) {
+			selected->handleKeyPress(e);
+		}
 		return;
 	}
 
 	const auto delta = (key == Qt::Key_Down ? 1 : -1);
-	const auto selected = findSelectedAction();
 	auto start = selected ? selected->index() : -1;
 	if (start < 0 || start >= _actions.size()) {
 		start = (delta > 0) ? (_actions.size() - 1) : 0;

ui/widgets/menu/menu.h

@@ -59,7 +59,7 @@ public:
 	void setKeyPressDelegate(Fn<bool(int key)> delegate) {
 		_keyPressDelegate = std::move(delegate);
 	}
-	void handleKeyPress(int key);
+	void handleKeyPress(not_null<QKeyEvent*> e);
 
 	void setMouseMoveDelegate(Fn<void(QPoint globalPosition)> delegate) {
 		_mouseMoveDelegate = std::move(delegate);

ui/widgets/menu/menu_action.cpp

@@ -9,6 +9,8 @@
 #include "ui/effects/ripple_animation.h"
 #include "ui/painter.h"
 
+#include <QtGui/QtEvents>
+
 namespace Ui::Menu {
 namespace {
 
@@ -173,4 +175,21 @@ int Action::contentHeight() const {
 	return _height;
 }
 
+void Action::handleKeyPress(not_null<QKeyEvent*> e) {
+	if (!isSelected()) {
+		return;
+	}
+	const auto key = e->key();
+	if (key == Qt::Key_Enter || key == Qt::Key_Return) {
+		setClicked(TriggeredSource::Keyboard);
+		return;
+	}
+	if (key == (style::RightToLeft() ? Qt::Key_Left : Qt::Key_Right)) {
+		if (hasSubmenu()) {
+			setClicked(TriggeredSource::Keyboard);
+			return;
+		}
+	}
+}
+
 } // namespace Ui::Menu

ui/widgets/menu/menu_action.h

@@ -26,6 +26,8 @@ public:
 	bool isEnabled() const override;
 	not_null<QAction*> action() const override;
 
+	void handleKeyPress(not_null<QKeyEvent*> e) override;
+
 protected:
 	QPoint prepareRippleStartPosition() const override;
 	QImage prepareRippleMask() const override;

ui/widgets/menu/menu_item_base.h

@@ -39,6 +39,9 @@ public:
 	bool hasSubmenu() const;
 	void setHasSubmenu(bool value);
 
+	virtual void handleKeyPress(not_null<QKeyEvent*> e) {
+	}
+
 	virtual not_null<QAction*> action() const = 0;
 	virtual bool isEnabled() const = 0;
 

ui/widgets/popup_menu.cpp

@@ -211,9 +211,9 @@ void PopupMenu::popupSubmenu(SubmenuPointer submenu, int actionTop, TriggeredSou
 	}
 }
 
-void PopupMenu::forwardKeyPress(int key) {
-	if (!handleKeyPress(key)) {
-		_menu->handleKeyPress(key);
+void PopupMenu::forwardKeyPress(not_null<QKeyEvent*> e) {
+	if (!handleKeyPress(e->key())) {
+		_menu->handleKeyPress(e);
 	}
 }
 
@@ -270,7 +270,7 @@ void PopupMenu::hideEvent(QHideEvent *e) {
 }
 
 void PopupMenu::keyPressEvent(QKeyEvent *e) {
-	forwardKeyPress(e->key());
+	forwardKeyPress(e);
 }
 
 void PopupMenu::mouseMoveEvent(QMouseEvent *e) {

ui/widgets/popup_menu.h

@@ -78,7 +78,7 @@ private:
 	void handleMenuResize();
 	void handleActivated(const Menu::CallbackData &data);
 	void handleTriggered(const Menu::CallbackData &data);
-	void forwardKeyPress(int key);
+	void forwardKeyPress(not_null<QKeyEvent*> e);
 	bool handleKeyPress(int key);
 	void forwardMouseMove(QPoint globalPosition) {
 		_menu->handleMouseMove(globalPosition);