src/gui/styles/qstylesheetstyle.cpp
changeset 37 758a864f9613
parent 33 3e2da88830cd
--- a/src/gui/styles/qstylesheetstyle.cpp	Fri Sep 17 08:34:18 2010 +0300
+++ b/src/gui/styles/qstylesheetstyle.cpp	Mon Oct 04 01:19:32 2010 +0300
@@ -4094,7 +4094,7 @@
     if (pe1 != PseudoElement_None) {
         QRenderRule subRule = renderRule(w, opt, pe1);
         if (subRule.bg != 0 || subRule.hasDrawable()) {
-            //We test subRule.bg dirrectly because hasBackground() would return false for background:none.
+            //We test subRule.bg directly because hasBackground() would return false for background:none.
             //But we still don't want the default drawning in that case (example for QScrollBar::add-page) (task 198926)
             subRule.drawRule(p, opt->rect);
         } else if (fallback) {
@@ -4283,6 +4283,13 @@
         }
     break;
 
+    case PE_FrameMenu:
+        if (rule.hasDrawable()) {
+            // Drawn by PE_PanelMenu
+            return;
+        }
+        break;
+
     case PE_PanelMenuBar:
     if (rule.hasDrawable()) {
         // Drawn by PE_Widget