eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-15 19:35:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing up colors per design spec

Browse Source
This commit is contained in:
Ben Fry
2015-08-21 12:25:51 -04:00
parent facadfc9f5
commit 53405ecf4b
6 changed files with 63 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/src/processing/mode/java/ErrorColumn.java
View File

@@ -140,10 +140,9 @@ public class ErrorColumn extends JPanel {
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();
}

34
java/src/processing/mode/java/pdex/JavaTextAreaPainter.java
View File

@@ -66,13 +66,10 @@ import processing.app.ui.Editor;
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 @@ public class JavaTextAreaPainter extends TextAreaPainter
}
// 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 @@ public class JavaTextAreaPainter extends TextAreaPainter
// }
// 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 @@ public class JavaTextAreaPainter extends TextAreaPainter
* @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");

37
java/theme/theme.txt
View File

@@ -1,37 +0,0 @@
# 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
# left hand gutter background color
gutter.bgcolor = #122535
# color of vertical separation line
#gutter.linecolor = #e9e9e9
# space (in px) added to left and right of gutter markers
gutter.padding = 3
# XQMODE
# underline colors
editor.errorcolor = #ed2630
editor.warningcolor = #ffc30e
editor.errormarkercolor = #ed2630
editor.warningmarkercolor = #ffc30e
# ERROR BAR - error bar on the right that shows the markers
# formerly #ed2630, tickmark on right-hand side in comp is #c20102
errorbar.errorcolor = #c20102
errorbar.warningcolor = #ffc30e
# using gutter.bcolor in 3.0a6
#errorbar.backgroundcolor = #2c343d