Menu icon behaviour fixed.

Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp

@@ -493,6 +493,30 @@ namespace AzQtComponents
                 }
             }
             break;
+            case CE_MenuItem:
+            {
+                const QMenu* menu = qobject_cast<const QMenu*>(widget);
+                QAction* action = menu->activeAction();
+                if (action)
+                {
+                    QMenu* subMenu = action->menu();
+                    if (subMenu)
+                    {
+                        QVariant noHover = subMenu->property("noHover");
+                        if (noHover.isValid() && noHover.toBool())
+                        {
+                            // First draw as standard to get the correct hover background for the complete control.
+                            QProxyStyle::drawControl(element, option, painter, widget);
+                            // Now draw the icon as non-hovered so control behaves as designed.
+                            const QStyleOptionMenuItem* opt = qstyleoption_cast<const QStyleOptionMenuItem*>(option);
+                            QStyleOptionMenuItem myOpt = *(const_cast<QStyleOptionMenuItem*>(opt));
+                            myOpt.state &= ~QStyle::State_Selected;
+                            return QProxyStyle::drawControl(element, &myOpt, painter, widget);
+                        }
+                    }
+                }
+            }
+            break;
         }
 
         return QProxyStyle::drawControl(element, option, painter, widget);

Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp

@@ -209,6 +209,7 @@ namespace AWSCore
             {
                 QMenu* subMenu = new QMenu(QObject::tr(menuText.c_str()));
                 subMenu->setIcon(QIcon(QString(":/Notifications/checkmark.svg")));
+                subMenu->setProperty("noHover", true);
                 this->insertMenu(*itr, subMenu);
                 this->removeAction(*itr);
                 return subMenu;