diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java index e26fcba94702..740cd93eae74 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java @@ -24,6 +24,7 @@ import com.intellij.openapi.actionSystem.ex.ActionUtil; import com.intellij.openapi.actionSystem.impl.PresentationFactory; import com.intellij.openapi.keymap.Keymap; import com.intellij.openapi.keymap.KeymapManager; +import com.intellij.openapi.keymap.impl.ui.MouseShortcutPanel; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.wm.IdeFocusManager; @@ -215,6 +216,10 @@ public final class IdeMouseEventDispatcher { return false; } + if (c instanceof MouseShortcutPanel || c.getParent() instanceof MouseShortcutPanel) { + return false; // forward mouse processing to the special shortcut panel + } + if (isHorizontalScrolling(c, e)) { boolean done = doHorizontalScrolling(c, (MouseWheelEvent)e); if (done) return true; diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutPanel.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutPanel.java index a407bb780f65..1b7e98fdf70c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutPanel.java @@ -26,7 +26,7 @@ import java.awt.event.MouseWheelEvent; /** * @author Sergey.Malenkov */ -final class MouseShortcutPanel extends ShortcutPanel { +public final class MouseShortcutPanel extends ShortcutPanel { static final JBColor FOREGROUND = new JBColor(0x8C8C8C, 0x8C8C8C); static final JBColor BACKGROUND = new JBColor(0xF5F5F5, 0x4B4F52); static final JBColor BORDER = new JBColor(0xDEDEDE, 0x383B3D);