IDEA-101815 Splitter divider is white on Windows

platform/platform-impl/src/com/intellij/ide/ui/laf/DarculaMetalTheme.java

@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2000-2009 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.
@@ -16,8 +16,7 @@
  */
 package com.intellij.ide.ui.laf;
 
-import com.intellij.ui.UIBundle;
-
+import javax.swing.*;
 import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.metal.DefaultMetalTheme;
 import java.awt.*;
@@ -25,27 +24,46 @@ import java.awt.*;
 /**
  * @author Konstantin Bulenkov
  */
-public class IdeaDarkMetalTheme extends DefaultMetalTheme {
-  public String getName() {
-    return UIBundle.message("idea.blue.metal.theme.name");
-  }
+public class DarculaMetalTheme extends DefaultMetalTheme {
 
-  private static final ColorUIResource darkGray = new ColorUIResource(132, 130, 132);
+  private final ColorUIResource myControlHighlightColor = new ColorUIResource(108, 111, 113);
+  private final ColorUIResource myControlDarkShadowColor = new ColorUIResource(39, 42, 44);
+  private final ColorUIResource myControlColor = new ColorUIResource(UIManager.getColor("control"));
   private static final ColorUIResource white = new ColorUIResource(255, 255, 255);
   private static final ColorUIResource darkBlue = new ColorUIResource(82, 108, 164);
-  //  private static ColorUIResource lightGray = new ColorUIResource(214, 211, 206);
   private static final ColorUIResource lightGray = new ColorUIResource(214, 214, 214);
+  private final ColorUIResource mySeparatorForeground = new ColorUIResource(53, 56, 58);
+
+  public static final ColorUIResource primary1 = new ColorUIResource(53, 56, 58);
+  private static final ColorUIResource primary2 = new ColorUIResource(91, 135, 206);
+  private static final ColorUIResource primary3 = new ColorUIResource(166, 202, 240);
+
+
+
+  public String getName() {
+    return "Darcula theme";
+  }
 
   public ColorUIResource getControl() {
-    return lightGray;
+    return myControlColor;
+  }
+
+  @Override
+  public ColorUIResource getControlHighlight() {
+    return myControlHighlightColor;
+  }
+
+  @Override
+  public ColorUIResource getControlDarkShadow() {
+    return myControlDarkShadowColor;
   }
 
   public ColorUIResource getSeparatorBackground() {
-    return white;
+    return getControl();
   }
 
   public ColorUIResource getSeparatorForeground() {
-    return darkGray;
+    return mySeparatorForeground;
   }
 
   public ColorUIResource getMenuBackground() {
@@ -64,10 +82,6 @@ public class IdeaDarkMetalTheme extends DefaultMetalTheme {
     return white;
   }
 
-  public static final ColorUIResource primary1 = new ColorUIResource(10, 36, 106);
-  private static final ColorUIResource primary2 = new ColorUIResource(91, 135, 206);
-  private static final ColorUIResource primary3 = new ColorUIResource(166, 202, 240);
-
   public ColorUIResource getFocusColor() {
     return new ColorUIResource(Color.black);
   }

platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.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.
@@ -344,7 +344,6 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo
     }
     else if (DarculaLookAndFeelInfo.CLASS_NAME.equals(lookAndFeelInfo.getClassName())) {
       DarculaLaf laf = new DarculaLaf();
-      MetalLookAndFeel.setCurrentTheme(new IdeaDarkMetalTheme());
       try {
         UIManager.setLookAndFeel(laf);
       }

platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.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.
@@ -15,6 +15,7 @@
  */
 package com.intellij.ide.ui.laf.darcula;
 
+import com.intellij.ide.ui.laf.DarculaMetalTheme;
 import com.intellij.ide.ui.laf.IdeaLaf;
 import com.intellij.ide.ui.laf.LafManagerImpl;
 import com.intellij.openapi.util.IconLoader;
@@ -91,6 +92,7 @@ public final class DarculaLaf extends BasicLookAndFeel {
       patchComboBox(metalDefaults, defaults);
       defaults.remove("Spinner.arrowButtonBorder");
       defaults.put("Spinner.arrowButtonSize", new Dimension(16, 5));
+      MetalLookAndFeel.setCurrentTheme(new DarculaMetalTheme());
       return defaults;
     }
     catch (Exception ignore) {

platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties

@@ -89,6 +89,8 @@ Spinner.background=3c3f41
 Spinner.arrowButtonInsets=1,1,1,1
 Spinner.editorBorderPainted=false
 
+SplitPane.highlight=3c3f41
+
 Hyperlink.linkColor=589df6
 
 Tree.collapsedIcon=AllIcons.Mac.Tree_white_right_arrow