Editor tabs: visual glitches

diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBEditorTabs.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBEditorTabs.java
index 98fc1dedcc5a2f5d034870100e89a6d0df12f14d..d1bcec8d2d9392f08b5c69e271ef83304472aa52 100644 (file)
--- a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBEditorTabs.java
+++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBEditorTabs.java
@@ -25,8 +25,6 @@ import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.registry.RegistryValue;
 import com.intellij.openapi.util.registry.RegistryValueListener;
 import com.intellij.openapi.wm.IdeFocusManager;
-import com.intellij.ui.Gray;
-import com.intellij.ui.JBColor;
 import com.intellij.ui.tabs.JBTabsPosition;
 import com.intellij.ui.tabs.TabInfo;
 import com.intellij.ui.tabs.impl.singleRow.CompressibleSingleRowLayout;
@@ -221,17 +219,9 @@ public class JBEditorTabs extends JBTabsImpl {
     }
 
     getPainter().doPaintBackground(g2d, clip, vertical, rectangle);
-    if (getTabsPosition() == JBTabsPosition.top && isSingleRow()) {
+    if (isSingleRow()) {
       g2d.setPaint(getEmptySpaceColor());
-      if (getFirstTabOffset() > 0) {
-        g2d.fillRect(clip.x, clip.y, clip.x + getFirstTabOffset() - 1, clip.y + maxLength - getActiveTabUnderlineHeight());
-      }
-      g2d.fillRect(clip.x + maxOffset, clip.y, clip.width - maxOffset, clip.y + maxLength - getActiveTabUnderlineHeight());
-      g2d.setPaint(new JBColor(Gray._181, UIUtil.getPanelBackground()));
-      g2d.setPaint(getPainter().getBackgroundColor());
-      g2d.drawLine(clip.x + maxOffset, clip.y + maxLength - getActiveTabUnderlineHeight(), clip.x + clip.width, clip.y + maxLength - getActiveTabUnderlineHeight());
-      g2d.setPaint(getEmptySpaceColor());
-      g2d.drawLine(clip.x, clip.y + maxLength, clip.width, clip.y + maxLength);
+      g2d.fill(rectangle);
     }
   }
 

diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java
index 1eebfea08d2d983a00298261900c80353217ae49..6cc405f297c2c0f08180f372b440d239720dba3c 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java
@@ -752,6 +752,7 @@ public final class EditorTabbedContainer implements Disposable, CloseAction.Clos
     @Override
     public void paintBorder(Component component, Graphics g, int x, int y, int w, int h) {
       Rectangle selectedBounds = myTabs.getSelectedBounds();
+      if (selectedBounds != null && selectedBounds.y > 0) selectedBounds = null;//Not first row selection
       Rectangle bounds = new Rectangle(x, y, w, h);
       g.setColor(UIUtil.CONTRAST_BORDER_COLOR);
       drawLine(bounds, selectedBounds, g, 0);