GH-102 Improved VisualVM appearance on dark themes (release142)

jisedlac · jisedlac · commit 6010c00bd210 · 2018-08-23T17:34:33.000+02:00
- "ugly" fix - additional hardcoded colors
diff --git a/visualvm/appui/src/com/sun/tools/visualvm/modules/appui/welcome/Constants.java b/visualvm/appui/src/com/sun/tools/visualvm/modules/appui/welcome/Constants.java
@@ -36,6 +36,7 @@
 public interface Constants {
 
     static final String COLOR_SCREEN_BACKGROUND = "ScreenBackgroundColor"; //NOI18N
+    static final String COLOR_SCREEN_BACKGROUND_DARK = "ScreenBackgroundColorDark"; //NOI18N
     static final String COLOR_CONTENT_BACKGROUND = "ContentBackgroundColor"; //NOI18N
     static final String BORDER_COLOR = "BorderColor"; //NOI18N
     
diff --git a/visualvm/appui/src/com/sun/tools/visualvm/modules/appui/welcome/StartPageContent.java b/visualvm/appui/src/com/sun/tools/visualvm/modules/appui/welcome/StartPageContent.java
@@ -25,6 +25,7 @@
 
 package com.sun.tools.visualvm.modules.appui.welcome;
 
+import com.sun.tools.visualvm.uisupport.UISupport;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
@@ -43,7 +44,9 @@ public class StartPageContent extends JPanel implements Constants {
     public StartPageContent() {
         super( new GridBagLayout() );
         
-        setBackground( Utils.getColor( COLOR_SCREEN_BACKGROUND ) );
+        setBackground( !UISupport.isDarkResultsBackground() ?
+                       Utils.getColor( COLOR_SCREEN_BACKGROUND ) :
+                       Utils.getColor( COLOR_SCREEN_BACKGROUND_DARK ) );
         setMinimumSize( new Dimension(START_PAGE_MIN_WIDTH,100) );
         
         add( new JLabel(), new GridBagConstraints(0,0,1,1,0.0,1.0,
diff --git a/visualvm/appui/src/com/sun/tools/visualvm/modules/appui/welcome/resources/Bundle.properties b/visualvm/appui/src/com/sun/tools/visualvm/modules/appui/welcome/resources/Bundle.properties
@@ -60,6 +60,7 @@ URL_OracleLogo=http://www.oracle.com
 # Colors
 #
 ScreenBackgroundColor=0xa9c7de
+ScreenBackgroundColorDark=0x325067
 ContentBackgroundColor=0xeff7fb
 MouseOverLinkColor=0xe76f00
 BorderColor=0x5B83A9
diff --git a/visualvm/charts/src/com/sun/tools/visualvm/charts/ColorFactory.java b/visualvm/charts/src/com/sun/tools/visualvm/charts/ColorFactory.java
@@ -25,6 +25,7 @@
 
 package com.sun.tools.visualvm.charts;
 
+import com.sun.tools.visualvm.uisupport.UISupport;
 import java.awt.Color;
 
 /**
@@ -41,11 +42,18 @@ final class ColorFactory {
                                                 new Color(158, 156,   0)
     };
 
-    private static final Color[][] PREDEFINED_GRADIENTS = new Color[][] {
+    private static final Color[][] PREDEFINED_GRADIENTS = !UISupport.isDarkResultsBackground() ?
+    new Color[][] {
         new Color[] { new Color(245, 204, 152), new Color(255, 243, 226) },
         new Color[] { new Color(151, 223, 246), new Color(227, 248, 255) },
         new Color[] { new Color(200, 163, 248), new Color(242, 232, 255) },
         new Color[] { new Color(212, 211, 131), new Color(244, 243, 217) }
+    } :
+    new Color[][] {
+        new Color[] { new Color(145, 104, 052), new Color(155, 143, 126) },
+        new Color[] { new Color(051, 123, 146), new Color(127, 148, 155) },
+        new Color[] { new Color(100, 063, 148), new Color(142, 132, 155) },
+        new Color[] { new Color(112, 111, 031), new Color(144, 143, 117) }
     };
     
 
diff --git a/visualvm/charts/src/com/sun/tools/visualvm/charts/xy/SimpleXYChartUtils.java b/visualvm/charts/src/com/sun/tools/visualvm/charts/xy/SimpleXYChartUtils.java
@@ -116,7 +116,7 @@ public class SimpleXYChartUtils {
 
         DEFAULT_BUFFER_STEP = 50;
 
-        AXIS_FONT_COLOR = new Color(90, 90, 90);
+        AXIS_FONT_COLOR = !UISupport.isDarkResultsBackground() ? new Color(90, 90, 90) : new Color(165, 165, 165);
         BACKGROUND_COLOR = UISupport.getDefaultBackground();
 
         VALUES_SPACING = Math.max(new TimeMarksPainter().getFont().getSize(), 15) + 10;
diff --git a/visualvm/charts/src/com/sun/tools/visualvm/charts/xy/XYBackground.java b/visualvm/charts/src/com/sun/tools/visualvm/charts/xy/XYBackground.java
@@ -25,6 +25,7 @@
 
 package com.sun.tools.visualvm.charts.xy;
 
+import com.sun.tools.visualvm.uisupport.UISupport;
 import org.netbeans.lib.profiler.charts.ChartContext;
 import org.netbeans.lib.profiler.charts.ChartDecorator;
 import java.awt.Color;
@@ -40,8 +41,10 @@
  */
 public class XYBackground implements ChartDecorator {
 
-    private static final Color GRADIENT_TOP = new Color(240, 240, 240);
-    private static final Color GRADIENT_BOTTOM = new Color(250, 250, 250);
+    private static final Color GRADIENT_TOP = !UISupport.isDarkResultsBackground() ?
+                               new Color(240, 240, 240) : new Color(60, 60, 60);
+    private static final Color GRADIENT_BOTTOM = !UISupport.isDarkResultsBackground() ?
+                               new Color(250, 250, 250) : new Color(75, 75, 75);
 
     public void paint(Graphics2D g, Rectangle dirtyArea, ChartContext context) {
         if (Utils.forceSpeed()) g.setPaint(GRADIENT_BOTTOM);
diff --git a/visualvm/core/src/com/sun/tools/visualvm/core/ui/components/DisplayAreaSupport.java b/visualvm/core/src/com/sun/tools/visualvm/core/ui/components/DisplayAreaSupport.java
@@ -29,6 +29,7 @@
 
 package com.sun.tools.visualvm.core.ui.components;
 
+import com.sun.tools.visualvm.uisupport.UISupport;
 import java.awt.BasicStroke;
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -64,10 +65,10 @@
  */
 class DisplayAreaSupport {
 
-    static final Color BORDER_COLOR_NORMAL = new Color(192, 192, 192);
-    static final Color BORDER_COLOR_HIGHLIGHT = new Color(128, 128, 128);
-    static final Color BACKGROUND_COLOR_NORMAL = new Color(245, 245, 245);
-    static final Color BACKGROUND_COLOR_HIGHLIGHT = new Color(235, 235, 235);
+    static final Color BORDER_COLOR_NORMAL = !UISupport.isDarkResultsBackground() ? new Color(192, 192, 192) : new Color(64, 64, 64);
+    static final Color BORDER_COLOR_HIGHLIGHT = !UISupport.isDarkResultsBackground() ? new Color(128, 128, 128) : new Color(90, 90, 90);
+    static final Color BACKGROUND_COLOR_NORMAL = !UISupport.isDarkResultsBackground() ? new Color(245, 245, 245) : new Color(50, 50, 50);
+    static final Color BACKGROUND_COLOR_HIGHLIGHT = !UISupport.isDarkResultsBackground() ? new Color(235, 235, 235) : new Color(55, 55, 55);
 
     static final Color COLOR_NONE = new Color(0, 0, 0);
     static final Color TABS_SEPARATOR = new Color(UIManager.getColor("Label.foreground").getRGB()); // NOI18N
diff --git a/visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/oql/OQLEditorComponent.java b/visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/oql/OQLEditorComponent.java
@@ -25,6 +25,7 @@
 
 package com.sun.tools.visualvm.heapviewer.oql;
 
+import com.sun.tools.visualvm.uisupport.UISupport;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -261,7 +262,7 @@ public Dimension getPreferredSize() {
                 return dim;
             }
             public void setBackground(Color c) {
-                super.setBackground(new Color(245, 245, 245));
+                super.setBackground(!UISupport.isDarkResultsBackground() ? new Color(245, 245, 245) : new Color(55, 55, 55));
             }
         };
 
diff --git a/visualvm/threaddump/src/com/sun/tools/visualvm/threaddump/impl/ThreadDumpView.java b/visualvm/threaddump/src/com/sun/tools/visualvm/threaddump/impl/ThreadDumpView.java
@@ -34,6 +34,7 @@
 import com.sun.tools.visualvm.core.ui.components.DataViewComponent;
 import com.sun.tools.visualvm.core.ui.components.ScrollableContainer;
 import com.sun.tools.visualvm.uisupport.HTMLTextArea;
+import com.sun.tools.visualvm.uisupport.UISupport;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.io.File;
@@ -140,12 +141,13 @@ private static String htmlize(String value) {
         }
 
         private static String transform(String value) {
+            String alternateColor = !UISupport.isDarkResultsBackground() ? "#0033CC" : "#FFCC33"; // NOI18N
             StringBuilder sb = new StringBuilder();
             String[] result = value.split("\\n"); // NOI18N
             for (int i = 0; i < result.length; i++) {
                 String line = result[i];
                 if (!line.isEmpty() && !Character.isWhitespace(line.charAt(0))) {
-                    sb.append("<span style=\"color: #0033CC\">"); // NOI18N
+                    sb.append("<span style=\"color: ").append(alternateColor).append("\">"); // NOI18N
                     sb.append(line);
                     sb.append("</span><br>"); // NOI18N
                 } else {
@@ -171,7 +173,7 @@ public void run() {
                 try {
                   HTMLTextArea area = new HTMLTextArea();
                   area.setEditorKit(new CustomHtmlEditorKit());
-                  area.setForeground(new Color(0xcc, 0x33, 0));
+                  area.setForeground(!UISupport.isDarkResultsBackground() ? new Color(0xcc, 0x33, 0) : new Color(0x33, 0xcc, 0xff));
                   area.setText("<pre>" + transform(htmlize(new String(data, "UTF-8"))) + "</pre>"); // NOI18N
                   area.setCaretPosition(0);
                   area.setBorder(BorderFactory.createEmptyBorder(14, 8, 14, 8));
diff --git a/visualvm/uisupport/src/com/sun/tools/visualvm/uisupport/UISupport.java b/visualvm/uisupport/src/com/sun/tools/visualvm/uisupport/UISupport.java
@@ -93,5 +93,9 @@ public static void runInEventDispatchThread(final Runnable r) {
     public static void runInEventDispatchThreadAndWait(final Runnable r) {
         UIUtils.runInEventDispatchThreadAndWait(r);
     }
+    
+    public static boolean isDarkResultsBackground() {
+        return UIUtils.isDarkResultsBackground();
+    }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ URL_OracleLogo=http://www.oracle.com`
`60`	`60`	`# Colors`
`61`	`61`	`#`
`62`	`62`	`ScreenBackgroundColor=0xa9c7de`
	`63`	`+ScreenBackgroundColorDark=0x325067`
`63`	`64`	`ContentBackgroundColor=0xeff7fb`
`64`	`65`	`MouseOverLinkColor=0xe76f00`
`65`	`66`	`BorderColor=0x5B83A9`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`
`26`	`26`	`package com.sun.tools.visualvm.heapviewer.oql;`
`27`	`27`
	`28`	`+import com.sun.tools.visualvm.uisupport.UISupport;`
`28`	`29`	`import java.awt.BorderLayout;`
`29`	`30`	`import java.awt.Color;`
`30`	`31`	`import java.awt.Component;`
`@@ -261,7 +262,7 @@ public Dimension getPreferredSize() {`
`261`	`262`	`return dim;`
`262`	`263`	`}`
`263`	`264`	`public void setBackground(Color c) {`
`264`		`- super.setBackground(new Color(245, 245, 245));`
	`265`	`+ super.setBackground(!UISupport.isDarkResultsBackground() ? new Color(245, 245, 245) : new Color(55, 55, 55));`
`265`	`266`	`}`
`266`	`267`	`};`
`267`	`268`
Original file line number	Diff line number	Diff line change
`@@ -93,5 +93,9 @@ public static void runInEventDispatchThread(final Runnable r) {`
`93`	`93`	`public static void runInEventDispatchThreadAndWait(final Runnable r) {`
`94`	`94`	`UIUtils.runInEventDispatchThreadAndWait(r);`
`95`	`95`	`}`
	`96`	`+`
	`97`	`+ public static boolean isDarkResultsBackground() {`
	`98`	`+ return UIUtils.isDarkResultsBackground();`
	`99`	`+ }`
`96`	`100`
`97`	`101`	`}`