fixing up colors per design spec

benfry · benfry · commit 232a11db423a · 2015-08-21T12:25:51.000-04:00
diff --git a/build/shared/lib/theme.txt b/build/shared/lib/theme.txt
@@ -3,8 +3,7 @@
 status.notice.fgcolor = #000000
 status.notice.bgcolor = #818b95
 status.error.fgcolor = #ffffff
-#status.error.bgcolor = #662000
-status.error.bgcolor = #9e1916
+status.error.bgcolor = #9E0A0A
 status.edit.fgcolor = #000000
 status.edit.bgcolor = #cc9900
 status.font = processing.sans,plain,13
@@ -36,10 +35,7 @@ footer.tab.unselected.color = #1f3241
 # The font is handled by preferences, so its size/etc are modifiable.
 console.color = #000000
 console.output.color = #cccccc
-#console.error.color = #ff3000
-# too dark!
-#console.error.color = #9e1916
-# brightened version
+# text color for errors printed in the console
 console.error.color = #d9211e
 
 # TOOLBAR BUTTONS
@@ -62,10 +58,6 @@ divider.dot.diameter = 3
 divider.dot.color = #505050
 
 # TOOLBAR BUTTON TEXT
-#buttons.status.font = processing.sans,bold,13
-#buttons.status.color = #ffffff
-#toolbar.sketch.font = processing.sans,plain,24
-#toolbar.sketch.color = #ffffff
 toolbar.rollover.font = processing.sans,plain,12
 toolbar.rollover.color = #ffffff
 toolbar.gradient.top = #142a3e
@@ -84,13 +76,6 @@ mode.title.color = #ffffff
 mode.background.color = #132638
 mode.outline.color = #3a505e
 
-# LINE STATUS
-# The editor line number status bar at the bottom of the screen
-#linestatus.color = #ffffff
-#linestatus.bgcolor = #29333d
-#linestatus.font = processing.sans,plain,13
-#linestatus.height  = 20
-
 
 # EDITOR - DETAILS
 
@@ -125,4 +110,38 @@ editor.gutter.text.font = processing.mono,plain,11
 #editor.gutter.text.color = #657d87
 #editor.gutter.text.color = #587478
 editor.gutter.text.color = #bbd6d5
+
+# bgcolor for the current (highlighted) line
 editor.gutter.linehighlight.color=#587478
+
+# left- and right-hand gutter color
+editor.gutter.bgcolor = #122535
+
+# squiggly line underneath errors in the editor
+editor.error.underline.color = #C40E0E
+# squiggly line underneath warnings
+editor.warning.underline.color = #ffc30e
+# lines next to the scrollbar showing where errors are located
+editor.column.error.color = #9F1613
+editor.column.warning.color = #ffc30e
+
+
+# DEBUGGER
+
+# breakpointed line background color
+breakpoint.bgcolor = #f0f0f0
+# marker for breakpointed lines in left hand gutter (2 ascii characters)
+breakpoint.marker = <>
+breakpoint.marker.color = #4a545e
+
+# current line background color
+currentline.bgcolor = #ffff96
+# marker for the current line in left hand gutter (2 ascii characters)
+currentline.marker = ->
+currentline.marker.color = #e27500
+
+# color of vertical separation line
+#gutter.linecolor = #e9e9e9
+# space (in px) added to left and right of gutter markers
+gutter.padding = 3
+
diff --git a/core/todo.txt b/core/todo.txt
@@ -3,6 +3,8 @@ X NullPointerException in selectFolder() on OS X
 X   https://github.com/processing/processing/issues/3661
 X Wrong positioning of circles in SVG shapes (regression from 2)
 X   https://github.com/processing/processing/issues/3685
+X setFill() on PShape in Java2D throws ArrayIndexOutOfBoundsException
+X   https://github.com/processing/processing/issues/3677
 
 cleaning
 X How do images behave when pixelDensity(2) is set?
diff --git a/java/src/processing/mode/java/ErrorColumn.java b/java/src/processing/mode/java/ErrorColumn.java
@@ -140,10 +140,9 @@ public ErrorColumn(JavaEditor editor, int height, JavaMode mode) {
 		this.preferredHeight = height;
 		this.errorCheckerService = editor.errorCheckerService;
 
-		errorColor = mode.getColor("errorbar.errorcolor"); //, errorColor);
-		warningColor = mode.getColor("errorbar.warningcolor"); //, warningColor);
-		//backgroundColor = mode.getColor("errorbar.backgroundcolor"); //, backgroundColor);
-		backgroundColor = mode.getColor("gutter.bgcolor");
+		errorColor = mode.getColor("editor.column.error.color");
+		warningColor = mode.getColor("editor.column.warning.color");
+		backgroundColor = mode.getColor("editor.gutter.bgcolor");
 
 		addListeners();
 	}
diff --git a/java/src/processing/mode/java/pdex/JavaTextAreaPainter.java b/java/src/processing/mode/java/pdex/JavaTextAreaPainter.java
@@ -66,13 +66,10 @@
 public class JavaTextAreaPainter extends TextAreaPainter
 	implements MouseListener, MouseMotionListener {
 
-//  protected JavaTextArea ta; // we need the subclassed textarea
-//  protected ErrorCheckerService errorCheckerService;
-
-  public Color errorColor; // = new Color(0xED2630);
-  public Color warningColor; // = new Color(0xFFC30E);
-  public Color errorMarkerColor; // = new Color(0xED2630);
-  public Color warningMarkerColor; // = new Color(0xFFC30E);
+  public Color errorUnderlineColor;
+  public Color warningUnderlineColor;
+//  public Color errorMarkerColor;
+//  public Color warningMarkerColor;
 
   protected Font gutterTextFont;
   protected Color gutterTextColor;
@@ -216,14 +213,6 @@ else if (s.length() == 0)
   }
 
 
-//  private void loadTheme(ExperimentalMode mode) {
-//    errorColor = mode.getThemeColor("editor.errorcolor", errorColor);
-//    warningColor = mode.getThemeColor("editor.warningcolor", warningColor);
-//    errorMarkerColor = mode.getThemeColor("editor.errormarkercolor", errorMarkerColor);
-//    warningMarkerColor = mode.getThemeColor("editor.warningmarkercolor", warningMarkerColor);
-//  }
-
-
   /**
    * Paint a line. Paints the gutter (with background color and text) then the
    * line (background color and text).
@@ -428,9 +417,9 @@ protected void paintErrorLine(Graphics gfx, int line, int x) {
 //      }
 //      gfx.fillRect(1, y + 2, 3, height - 2);
 
-      gfx.setColor(errorColor);
+      gfx.setColor(errorUnderlineColor);
       if (isWarning) {
-        gfx.setColor(warningColor);
+        gfx.setColor(warningUnderlineColor);
       }
       int xx = x1;
 
@@ -479,13 +468,10 @@ static private String trimRight(String string) {
    * @param mode
    */
   public void setMode(JavaMode mode) {
-    //this.errorCheckerService = ecs;
-    //loadTheme(mode);
-
-    errorColor = mode.getColor("editor.errorcolor"); //, errorColor);
-    warningColor = mode.getColor("editor.warningcolor"); //, warningColor);
-    errorMarkerColor = mode.getColor("editor.errormarkercolor"); //, errorMarkerColor);
-    warningMarkerColor = mode.getColor("editor.warningmarkercolor"); //, warningMarkerColor);
+    errorUnderlineColor = mode.getColor("editor.error.underline.color");
+    warningUnderlineColor = mode.getColor("editor.warning.underline.color");
+//    errorMarkerColor = mode.getColor("editor.errormarkercolor");
+//    warningMarkerColor = mode.getColor("editor.warningmarkercolor");
 
     gutterTextFont = mode.getFont("editor.gutter.text.font");
     gutterTextColor = mode.getColor("editor.gutter.text.color");
diff --git a/java/theme/theme.txt b/java/theme/theme.txt
diff --git a/todo.txt b/todo.txt
@@ -6,7 +6,10 @@ X line selected for errors is off by one or two
 X   https://github.com/processing/processing/issues/3654
 X PDE window leaks undisposed Timer objects even when closed
 X   https://github.com/processing/processing/issues/3655
-_ items still show up in "Recent" if they no longer exist (on startup)
+X prompt to install Xcode coming up on Export to Application
+X   http://stackoverflow.com/questions/15371925/how-to-check-if-command-line-tools-is-installed
+X   "xcode-select -p" returns 0 if they exist (and the dir) or 2 if they don't
+X   no special case added for 10.8, but it's on the way out
 
 contribs
 X Undo does not move to the correct location in the editor window
@@ -41,12 +44,13 @@ X   https://github.com/processing/processing/issues/3649
 X Use 1x or 2x icons in the CM
 X   https://github.com/processing/processing/pull/3681
 
-cleaning
+earlier/cleaning
 X modify build to insert these after antlr run:
 X   @SuppressWarnings({"unused", "cast"})
 X   or get the updated ANTLR, which likely would support it
 o scrollable stack trace
 o   http://www.javalobby.org/java/forums/t19012.html
+X disable the Export button if no platforms selected on Export to Application
 
 cleaning/libraries
 o different name for 'lib' folder because of libraries folder?
@@ -92,13 +96,15 @@ _   http://www.oracle.com/us/technologies/java/locale-140624.html
 _ CM: Clicking item in Libraries list throws exception
 _   https://github.com/processing/processing/issues/3667
 _ Casey reports that exported app still asks to download Java
-_ prompt to install Xcode coming up on Export to Application
-_   http://stackoverflow.com/questions/15371925/how-to-check-if-command-line-tools-is-installed
-_   "xcode-select -p" returns 0 if they exist (and the dir) or 2 if they don't
+_   could this be a JOGL bug (linking against the app stub?)
 _ Contributions Manager UI design
 _   https://github.com/processing/processing/issues/3482
 _ Ready to add contributed example packages?
 _   https://github.com/processing/processing/issues/2953
+_ items still show up in "Recent" if they no longer exist (on startup)
+
+
+sketch modified externally
 _ sketch modified externally with FAT32 volumes on OS X
 _   https://github.com/processing/processing/issues/3387
 _ also appearing with encrypted volumes?
@@ -115,6 +121,7 @@ _   https://github.com/processing/processing/issues/3665
 _ fix red in sidebar, the squiggly line beneath code
 _ Error/warning location visualisation not updating when editor resizes
 _   https://github.com/processing/processing/issues/3619
+_ error/warning location is awkward when no scroll bar is in use
 _ show hover text when the mouse is over the 'debug' button
 _ show number of updates available in the footer
 _   https://github.com/processing/processing/issues/3518
@@ -247,7 +254,6 @@ _ improve start time by populating sketchbook/libraries on threads
 _   https://github.com/processing/processing/issues/2945
 _ longer PR about sketchbook stuff, but closed
 _   https://github.com/processing/processing/pull/3178
-_ disable the Export button if no platforms selected on Export to Application
 
 
 help me
