ActionToolbar: disabled action groups should be painted disabled

diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/Utils.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/Utils.java
index 2d918426be4d3058777bb346f17198589904b633..6dd22e93b87c26149f9a8dc0b457b067631f866c 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/Utils.java
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/Utils.java
@@ -113,9 +113,11 @@ public class Utils{
       if (child instanceof ActionGroup) {
         ActionGroup actionGroup = (ActionGroup)child;
         if (actionGroup.isPopup()) { // popup menu has its own presentation
-          // disable group if it contains no visible actions
-          final boolean enabled = actionGroup.canBePerformed(context) || hasVisibleChildren(actionGroup, presentationFactory, context, place);
-          presentation.setEnabled(enabled);
+          if (presentation.isEnabled()) {
+            // disable group if it contains no visible actions
+            final boolean enabled = actionGroup.canBePerformed(context) || hasVisibleChildren(actionGroup, presentationFactory, context, place);
+            presentation.setEnabled(enabled);
+          }
           list.add(child);
         }
         else {