Skip to content

Commit 232a11d

Browse files
benfrybenfry
committed
fixing up colors per design spec
1 parent 7713c08 commit 232a11d

6 files changed

Lines changed: 63 additions & 88 deletions

File tree

‎build/shared/lib/theme.txt‎

Lines changed: 36 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
status.notice.fgcolor = #000000
44
status.notice.bgcolor = #818b95
55
status.error.fgcolor = #ffffff
6-
#status.error.bgcolor = #662000
7-
status.error.bgcolor = #9e1916
6+
status.error.bgcolor = #9E0A0A
87
status.edit.fgcolor = #000000
98
status.edit.bgcolor = #cc9900
109
status.font = processing.sans,plain,13
@@ -36,10 +35,7 @@ footer.tab.unselected.color = #1f3241
3635
# The font is handled by preferences, so its size/etc are modifiable.
3736
console.color = #000000
3837
console.output.color = #cccccc
39-
#console.error.color = #ff3000
40-
# too dark!
41-
#console.error.color = #9e1916
42-
# brightened version
38+
# text color for errors printed in the console
4339
console.error.color = #d9211e
4440

4541
# TOOLBAR BUTTONS
@@ -62,10 +58,6 @@ divider.dot.diameter = 3
6258
divider.dot.color = #505050
6359

6460
# TOOLBAR BUTTON TEXT
65-
#buttons.status.font = processing.sans,bold,13
66-
#buttons.status.color = #ffffff
67-
#toolbar.sketch.font = processing.sans,plain,24
68-
#toolbar.sketch.color = #ffffff
6961
toolbar.rollover.font = processing.sans,plain,12
7062
toolbar.rollover.color = #ffffff
7163
toolbar.gradient.top = #142a3e
@@ -84,13 +76,6 @@ mode.title.color = #ffffff
8476
mode.background.color = #132638
8577
mode.outline.color = #3a505e
8678

87-
# LINE STATUS
88-
# The editor line number status bar at the bottom of the screen
89-
#linestatus.color = #ffffff
90-
#linestatus.bgcolor = #29333d
91-
#linestatus.font = processing.sans,plain,13
92-
#linestatus.height = 20
93-
9479

9580
# EDITOR - DETAILS
9681

@@ -125,4 +110,38 @@ editor.gutter.text.font = processing.mono,plain,11
125110
#editor.gutter.text.color = #657d87
126111
#editor.gutter.text.color = #587478
127112
editor.gutter.text.color = #bbd6d5
113+
114+
# bgcolor for the current (highlighted) line
128115
editor.gutter.linehighlight.color=#587478
116+
117+
# left- and right-hand gutter color
118+
editor.gutter.bgcolor = #122535
119+
120+
# squiggly line underneath errors in the editor
121+
editor.error.underline.color = #C40E0E
122+
# squiggly line underneath warnings
123+
editor.warning.underline.color = #ffc30e
124+
# lines next to the scrollbar showing where errors are located
125+
editor.column.error.color = #9F1613
126+
editor.column.warning.color = #ffc30e
127+
128+
129+
# DEBUGGER
130+
131+
# breakpointed line background color
132+
breakpoint.bgcolor = #f0f0f0
133+
# marker for breakpointed lines in left hand gutter (2 ascii characters)
134+
breakpoint.marker = <>
135+
breakpoint.marker.color = #4a545e
136+
137+
# current line background color
138+
currentline.bgcolor = #ffff96
139+
# marker for the current line in left hand gutter (2 ascii characters)
140+
currentline.marker = ->
141+
currentline.marker.color = #e27500
142+
143+
# color of vertical separation line
144+
#gutter.linecolor = #e9e9e9
145+
# space (in px) added to left and right of gutter markers
146+
gutter.padding = 3
147+

‎core/todo.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ X NullPointerException in selectFolder() on OS X
33
X https://github.com/processing/processing/issues/3661
44
X Wrong positioning of circles in SVG shapes (regression from 2)
55
X https://github.com/processing/processing/issues/3685
6+
X setFill() on PShape in Java2D throws ArrayIndexOutOfBoundsException
7+
X https://github.com/processing/processing/issues/3677
68

79
cleaning
810
X How do images behave when pixelDensity(2) is set?

‎java/src/processing/mode/java/ErrorColumn.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,9 @@ public ErrorColumn(JavaEditor editor, int height, JavaMode mode) {
140140
this.preferredHeight = height;
141141
this.errorCheckerService = editor.errorCheckerService;
142142

143-
errorColor = mode.getColor("errorbar.errorcolor"); //, errorColor);
144-
warningColor = mode.getColor("errorbar.warningcolor"); //, warningColor);
145-
//backgroundColor = mode.getColor("errorbar.backgroundcolor"); //, backgroundColor);
146-
backgroundColor = mode.getColor("gutter.bgcolor");
143+
errorColor = mode.getColor("editor.column.error.color");
144+
warningColor = mode.getColor("editor.column.warning.color");
145+
backgroundColor = mode.getColor("editor.gutter.bgcolor");
147146

148147
addListeners();
149148
}

‎java/src/processing/mode/java/pdex/JavaTextAreaPainter.java‎

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,10 @@
6666
public class JavaTextAreaPainter extends TextAreaPainter
6767
implements MouseListener, MouseMotionListener {
6868

69-
// protected JavaTextArea ta; // we need the subclassed textarea
70-
// protected ErrorCheckerService errorCheckerService;
71-
72-
public Color errorColor; // = new Color(0xED2630);
73-
public Color warningColor; // = new Color(0xFFC30E);
74-
public Color errorMarkerColor; // = new Color(0xED2630);
75-
public Color warningMarkerColor; // = new Color(0xFFC30E);
69+
public Color errorUnderlineColor;
70+
public Color warningUnderlineColor;
71+
// public Color errorMarkerColor;
72+
// public Color warningMarkerColor;
7673

7774
protected Font gutterTextFont;
7875
protected Color gutterTextColor;
@@ -216,14 +213,6 @@ else if (s.length() == 0)
216213
}
217214

218215

219-
// private void loadTheme(ExperimentalMode mode) {
220-
// errorColor = mode.getThemeColor("editor.errorcolor", errorColor);
221-
// warningColor = mode.getThemeColor("editor.warningcolor", warningColor);
222-
// errorMarkerColor = mode.getThemeColor("editor.errormarkercolor", errorMarkerColor);
223-
// warningMarkerColor = mode.getThemeColor("editor.warningmarkercolor", warningMarkerColor);
224-
// }
225-
226-
227216
/**
228217
* Paint a line. Paints the gutter (with background color and text) then the
229218
* line (background color and text).
@@ -428,9 +417,9 @@ protected void paintErrorLine(Graphics gfx, int line, int x) {
428417
// }
429418
// gfx.fillRect(1, y + 2, 3, height - 2);
430419

431-
gfx.setColor(errorColor);
420+
gfx.setColor(errorUnderlineColor);
432421
if (isWarning) {
433-
gfx.setColor(warningColor);
422+
gfx.setColor(warningUnderlineColor);
434423
}
435424
int xx = x1;
436425

@@ -479,13 +468,10 @@ static private String trimRight(String string) {
479468
* @param mode
480469
*/
481470
public void setMode(JavaMode mode) {
482-
//this.errorCheckerService = ecs;
483-
//loadTheme(mode);
484-
485-
errorColor = mode.getColor("editor.errorcolor"); //, errorColor);
486-
warningColor = mode.getColor("editor.warningcolor"); //, warningColor);
487-
errorMarkerColor = mode.getColor("editor.errormarkercolor"); //, errorMarkerColor);
488-
warningMarkerColor = mode.getColor("editor.warningmarkercolor"); //, warningMarkerColor);
471+
errorUnderlineColor = mode.getColor("editor.error.underline.color");
472+
warningUnderlineColor = mode.getColor("editor.warning.underline.color");
473+
// errorMarkerColor = mode.getColor("editor.errormarkercolor");
474+
// warningMarkerColor = mode.getColor("editor.warningmarkercolor");
489475

490476
gutterTextFont = mode.getFont("editor.gutter.text.font");
491477
gutterTextColor = mode.getColor("editor.gutter.text.color");

‎java/theme/theme.txt‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎todo.txt‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ X line selected for errors is off by one or two
66
X https://github.com/processing/processing/issues/3654
77
X PDE window leaks undisposed Timer objects even when closed
88
X https://github.com/processing/processing/issues/3655
9-
_ items still show up in "Recent" if they no longer exist (on startup)
9+
X prompt to install Xcode coming up on Export to Application
10+
X http://stackoverflow.com/questions/15371925/how-to-check-if-command-line-tools-is-installed
11+
X "xcode-select -p" returns 0 if they exist (and the dir) or 2 if they don't
12+
X no special case added for 10.8, but it's on the way out
1013

1114
contribs
1215
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
4144
X Use 1x or 2x icons in the CM
4245
X https://github.com/processing/processing/pull/3681
4346

44-
cleaning
47+
earlier/cleaning
4548
X modify build to insert these after antlr run:
4649
X @SuppressWarnings({"unused", "cast"})
4750
X or get the updated ANTLR, which likely would support it
4851
o scrollable stack trace
4952
o http://www.javalobby.org/java/forums/t19012.html
53+
X disable the Export button if no platforms selected on Export to Application
5054

5155
cleaning/libraries
5256
o different name for 'lib' folder because of libraries folder?
@@ -92,13 +96,15 @@ _ http://www.oracle.com/us/technologies/java/locale-140624.html
9296
_ CM: Clicking item in Libraries list throws exception
9397
_ https://github.com/processing/processing/issues/3667
9498
_ Casey reports that exported app still asks to download Java
95-
_ prompt to install Xcode coming up on Export to Application
96-
_ http://stackoverflow.com/questions/15371925/how-to-check-if-command-line-tools-is-installed
97-
_ "xcode-select -p" returns 0 if they exist (and the dir) or 2 if they don't
99+
_ could this be a JOGL bug (linking against the app stub?)
98100
_ Contributions Manager UI design
99101
_ https://github.com/processing/processing/issues/3482
100102
_ Ready to add contributed example packages?
101103
_ https://github.com/processing/processing/issues/2953
104+
_ items still show up in "Recent" if they no longer exist (on startup)
105+
106+
107+
sketch modified externally
102108
_ sketch modified externally with FAT32 volumes on OS X
103109
_ https://github.com/processing/processing/issues/3387
104110
_ also appearing with encrypted volumes?
@@ -115,6 +121,7 @@ _ https://github.com/processing/processing/issues/3665
115121
_ fix red in sidebar, the squiggly line beneath code
116122
_ Error/warning location visualisation not updating when editor resizes
117123
_ https://github.com/processing/processing/issues/3619
124+
_ error/warning location is awkward when no scroll bar is in use
118125
_ show hover text when the mouse is over the 'debug' button
119126
_ show number of updates available in the footer
120127
_ https://github.com/processing/processing/issues/3518
@@ -247,7 +254,6 @@ _ improve start time by populating sketchbook/libraries on threads
247254
_ https://github.com/processing/processing/issues/2945
248255
_ longer PR about sketchbook stuff, but closed
249256
_ https://github.com/processing/processing/pull/3178
250-
_ disable the Export button if no platforms selected on Export to Application
251257

252258

253259
help me

0 commit comments

Comments
 (0)