diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java index 2908b4f36715..3327abfe7a62 100644 --- a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java +++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1653,6 +1653,9 @@ public class JBTabsImpl extends JComponent @Nullable protected Color getActiveTabColor(@Nullable final Color c) { + if (UIUtil.isUnderDarcula() || UIUtil.isUnderIntelliJLaF()) { + return new JBColor(new Color(162, 186, 224), new Color(65, 81, 109)); + } final TabInfo info = getSelectedInfo(); if (info == null) { return c; @@ -1730,7 +1733,7 @@ public class JBTabsImpl extends JComponent } final Color tabColor = getActiveTabColor(null); - Color borderColor = tabColor == null ? UIUtil.getBoundsColor(paintFocused) : tabColor.darker(); + Color borderColor = tabColor == null || UIUtil.isUnderDarcula() || UIUtil.isUnderIntelliJLaF() ? UIUtil.getBoundsColor(paintFocused) : tabColor.darker(); g2d.setColor(borderColor); if (!isHideTabs()) { diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties index 438b0590ca18..a04c52385a44 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties @@ -49,7 +49,7 @@ TabbedPaneUI=com.intellij.ide.ui.laf.darcula.ui.DarculaTabbedPaneUI TabbedPane.tabInsets=0,4,0,4 TabbedPane.highlight=292b2d TabbedPane.light=444444 -TabbedPane.selected=626262 +TabbedPane.selected=41516D TabbedPane.selectHighlight=3c3f41 TabbedPane.contentBorderInsets=3,1,1,1 TabbedPane.darkShadow=292b2d diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties index 3d76afe84ae4..10113e560409 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties @@ -53,7 +53,7 @@ TabbedPaneUI=com.intellij.ide.ui.laf.darcula.ui.DarculaTabbedPaneUI TabbedPane.tabInsets=0,4,0,4 TabbedPane.highlight=cccccc TabbedPane.light=444444 -TabbedPane.selected=93b3ec +TabbedPane.selected=A2BAE0 TabbedPane.selectHighlight=d2d2d2 TabbedPane.contentBorderInsets=3,1,1,1 TabbedPane.darkShadow=cccccc