From 1c14306abab06a8c66ce25ac1fbe783f745eff39 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 4 Apr 2022 17:15:36 +0300
Subject: [PATCH] Revert "Added ability to set text color of menu item via
 QAction."

This reverts commit 8d181e53c573639d8a4a7e66e89bc01791b0572b.
---
 ui/widgets/menu/menu_action.cpp | 16 +---------------
 ui/widgets/menu/menu_action.h   |  1 -
 ui/widgets/menu/menu_common.cpp |  5 +----
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/ui/widgets/menu/menu_action.cpp b/ui/widgets/menu/menu_action.cpp
index d20e734..a37bfbe 100644
--- a/ui/widgets/menu/menu_action.cpp
+++ b/ui/widgets/menu/menu_action.cpp
@@ -105,13 +105,7 @@ void Action::paint(Painter &p) {
 	if (const auto icon = (selected ? _iconOver : _icon)) {
 		icon->paint(p, _st.itemIconPosition, width());
 	}
-	p.setPen(_fgOverride
-		? QPen(*_fgOverride)
-		: selected
-		? _st.itemFgOver
-		: enabled
-		? _st.itemFg
-		: _st.itemFgDisabled);
+	p.setPen(selected ? _st.itemFgOver : (enabled ? _st.itemFg : _st.itemFgDisabled));
 	paintText(p);
 	if (hasSubmenu()) {
 		const auto left = width() - _st.itemPadding.right() - _st.arrow.width();
@@ -174,14 +168,6 @@ void Action::processAction() {
 	_shortcut = actionShortcut;
 	setMinWidth(w);
 	update();
-
-	// TODO better way.
-	if (const auto variant = _action->data(); variant.isValid()) {
-		const auto overrideColor = variant.value<QColor>();
-		if (overrideColor.isValid()) {
-			_fgOverride = overrideColor;
-		}
-	}
 }
 
 bool Action::isEnabled() const {
diff --git a/ui/widgets/menu/menu_action.h b/ui/widgets/menu/menu_action.h
index 23d28d6..f1b852a 100644
--- a/ui/widgets/menu/menu_action.h
+++ b/ui/widgets/menu/menu_action.h
@@ -54,7 +54,6 @@ private:
 	const style::icon *_iconOver;
 //	std::unique_ptr<ToggleView> _toggle;
 	int _textWidth = 0;
-	std::optional<QColor> _fgOverride;
 	const int _height;
 
 };
diff --git a/ui/widgets/menu/menu_common.cpp b/ui/widgets/menu/menu_common.cpp
index 2aa6ffb..badc14c 100644
--- a/ui/widgets/menu/menu_common.cpp
+++ b/ui/widgets/menu/menu_common.cpp
@@ -6,8 +6,6 @@
 //
 #include "ui/widgets/menu/menu_common.h"
 
-#include "ui/ui_utility.h"
-
 #include <QAction>
 
 namespace Ui::Menu {
@@ -16,8 +14,7 @@ not_null<QAction*> CreateAction(
 		QWidget *parent,
 		const QString &text,
 		Fn<void()> &&callback) {
-	const auto action = Ui::CreateChild<QAction>(parent);
-	action->setText(text);
+	const auto action = new QAction(text, parent);
 	parent->connect(
 		action,
 		&QAction::triggered,