Menu icon behaviour fixed.

2021-06-11 14:52:01 +01:00
parent 0cee5150c7
commit ed47bb07ab
2 changed files with 25 additions and 0 deletions
@@ -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);