fix font/colors in completion dialog (processing#3906)

benfry · benfry · commit 0ec09205fe43 · 2015-09-29T23:13:43.000-04:00
diff --git a/java/src/processing/mode/java/pdex/CompletionPanel.java b/java/src/processing/mode/java/pdex/CompletionPanel.java
@@ -21,6 +21,7 @@
 package processing.mode.java.pdex;
 
 import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.Component;
 import java.awt.Font;
 import java.awt.FontMetrics;
@@ -40,6 +41,7 @@
 
 import processing.app.Base;
 import processing.app.Messages;
+import processing.app.Mode;
 import processing.app.syntax.JEditTextArea;
 import processing.app.ui.Toolkit;
 import processing.mode.java.JavaEditor;
@@ -84,6 +86,9 @@ public class CompletionPanel {
   static public ImageIcon methodIcon;
   static public ImageIcon localVarIcon;
 
+  static Color selectionBgColor;
+  static Color textColor;
+
 
   /**
    * Triggers the completion popup
@@ -108,11 +113,17 @@ public CompletionPanel(final JEditTextArea textarea,
     }
 
     if (classIcon == null) {
-      File dir = new File(editor.getMode().getFolder(), "theme/completion");
+      Mode mode = editor.getMode();
+
+      File dir = new File(mode.getFolder(), "theme/completion");
       classIcon = Toolkit.getIconX(dir, "class_obj");
       methodIcon = Toolkit.getIconX(dir, "methpub_obj");
       fieldIcon = Toolkit.getIconX(dir, "field_protected_obj");
       localVarIcon = Toolkit.getIconX(dir, "field_default_obj");
+
+      //selectionBgColor = mode.getColor("");  // no theme.txt for Java Mode
+      selectionBgColor = new Color(0xffF0F0F0);
+      textColor = new Color(0xff222222);
     }
 
     popupMenu = new JPopupMenu();
@@ -560,6 +571,11 @@ public Component getListCellRendererComponent(JList<?> list, Object value,
                                                                  index,
                                                                  isSelected,
                                                                  cellHasFocus);
+      if (isSelected) {
+        label.setBackground(selectionBgColor);
+      }
+      label.setForeground(textColor);
+
       if (value instanceof CompletionCandidate) {
         CompletionCandidate cc = (CompletionCandidate) value;
         switch (cc.getType()) {
diff --git a/todo.txt b/todo.txt
@@ -89,12 +89,16 @@ _ mouse events (i.e. toggle breakpoint) seem to be firing twice
 
 3.0 final
 _ https://github.com/processing/processing/milestones/3.0%20final
+_ completion panel
+_   what should the background color be? 
+_   test fg/bg color on other operating systems
+_   fix icon sizes/design
 _ fix the design of the completions window
 X   remove extra border around the outside
-_   change font
+X   change font
+X   add 2x version of the icons
 _   change selection highlight color
 _   put some margin around it
-X   add 2x version of the icons
 _   https://github.com/processing/processing/issues/3906
 _ import suggestions box needs design review
 _   https://github.com/processing/processing/issues/3407
