eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

implementing more of the gui comps

Browse Source
This commit is contained in:
Ben Fry
2015-05-19 01:15:07 -04:00
parent 633b987225
commit 0d4d8353f1
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/processing/app/EditorHeader.java
+1 -1
View File
@@ -410,7 +410,7 @@ public class EditorHeader extends JComponent {
if (code.isModified()) {
g.setColor(modifiedColor);
//g.drawLine(tab.left + NOTCH, top, tab.right - NOTCH, top);
g.drawLine(tab.left, TAB_TOP, tab.right, TAB_TOP);
g.drawLine(tab.left + (i == 0 ? CURVE_RADIUS : 0), TAB_TOP, tab.right, TAB_TOP);
}
}
build/shared/lib/theme.txt
+11 -7
View File
@@ -10,7 +10,7 @@ status.font = processing.sans,plain,14
# TABS
# Settings for the tab area at the top.
header.text.font = processing.sans,bold,13
header.text.font = processing.sans,bold,14
header.text.selected.color = #000000
header.text.unselected.color = #ffffff
#header.tab.arrow.color = #000000
@@ -71,10 +71,10 @@ mode.background.color = #3D5362
# 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
#linestatus.color = #ffffff
#linestatus.bgcolor = #29333d
#linestatus.font = processing.sans,plain,13
#linestatus.height = 20
# EDITOR - DETAILS
@@ -87,7 +87,8 @@ editor.gradient.top = #122535
editor.gradient.bottom = #020408
# highlight for the current line
editor.linehighlight.color=#e2e2e2
#editor.linehighlight.color=#e2e2e2
editor.linehighlight.color=#ebfffd
# highlight for the current line
editor.linehighlight=true
@@ -106,4 +107,7 @@ editor.brackethighlight = true
editor.brackethighlight.color = #006699
editor.gutter.text.font = processing.mono,plain,11
editor.gutter.text.color = #657d87
#editor.gutter.text.color = #657d87
#editor.gutter.text.color = #587478
editor.gutter.text.color = #bbd6d5
editor.gutter.linehighlight.color=#587478
java/src/processing/mode/java/pdex/JavaTextAreaPainter.java
+7 -1
View File
@@ -75,6 +75,7 @@ public class JavaTextAreaPainter extends TextAreaPainter
protected Font gutterTextFont;
protected Color gutterTextColor;
protected Color gutterLineHighlightColor;
// protected Color gutterTempColor;
public static class ErrorLineCoord {
@@ -242,9 +243,13 @@ public class JavaTextAreaPainter extends TextAreaPainter
* @param x horizontal position
*/
protected void paintLeftGutter(Graphics gfx, int line, int x) {
gfx.setColor(getTextArea().gutterBgColor);
// gfx.setColor(Color.ORANGE);
int y = textArea.lineToY(line) + fm.getLeading() + fm.getMaxDescent();
if (line == textArea.getSelectionStopLine()) {
gfx.setColor(gutterLineHighlightColor);
} else {
gfx.setColor(getTextArea().gutterBgColor);
}
gfx.fillRect(0, y, Editor.LEFT_GUTTER, fm.getHeight());
String text = getTextArea().getGutterText(line);
@@ -535,6 +540,7 @@ public class JavaTextAreaPainter extends TextAreaPainter
gutterTextFont = mode.getFont("editor.gutter.text.font");
gutterTextColor = mode.getColor("editor.gutter.text.color");
gutterLineHighlightColor = mode.getColor("editor.gutter.linehighlight.color");
}
@Override