From ff12887cd88a4c9564c8be2c4503ce9e201aa0e7 Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Sun, 29 Jan 2012 16:53:51 +0400 Subject: [PATCH] don't change over image when going through separators --- .../execution/ui/layout/impl/GridCellImpl.java | 16 ++++++++++++++++ .../ui/layout/impl/RunnerContentUi.java | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridCellImpl.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridCellImpl.java index 8a03f1bc543f..7203667e610c 100644 --- a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridCellImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridCellImpl.java @@ -24,6 +24,7 @@ import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.util.ActionCallback; import com.intellij.openapi.util.DimensionService; import com.intellij.openapi.util.MutualMap; +import com.intellij.ui.awt.RelativePoint; import com.intellij.ui.components.panels.NonOpaquePanel; import com.intellij.ui.content.Content; import com.intellij.ui.docking.DockContainer; @@ -77,6 +78,21 @@ public class GridCellImpl implements GridCell { protected Color getFocusedBottomFillColor() { return new Color(194, 203, 219); } + + @Override + public void processDropOver(TabInfo over, RelativePoint point) { + ((RunnerContentUi)myContext).myTabs.processDropOver(over, point); + } + + @Override + public Image startDropOver(TabInfo tabInfo, RelativePoint point) { + return ((RunnerContentUi)myContext).myTabs.startDropOver(tabInfo, point); + } + + @Override + public void resetDropOver(TabInfo tabInfo) { + ((RunnerContentUi)myContext).myTabs.resetDropOver(tabInfo); + } }.setDataProvider(new DataProvider() { @Nullable public Object getData(@NonNls final String dataId) { diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java index a6211227e015..5846a58bd543 100644 --- a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java +++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java @@ -509,7 +509,7 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac final Point p = point.getPoint(getComponent()); Component c = SwingUtilities.getDeepestComponentAt(getComponent(), p.x, p.y); while (c != null) { - if (c instanceof JBTabs) { + if (c instanceof JBRunnerTabs) { return (JBTabs)c; } c = c.getParent();