implementing more of the gui comps

benfry · benfry · commit f974089399f6 · 2015-05-19T01:15:07.000-04:00
diff --git a/app/src/processing/app/EditorHeader.java b/app/src/processing/app/EditorHeader.java
@@ -410,7 +410,7 @@ private boolean placeTabs(int left, int right, Graphics2D g) {
         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);
         }
       }
 
diff --git a/build/shared/lib/theme.txt b/build/shared/lib/theme.txt
@@ -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
diff --git a/java/src/processing/mode/java/pdex/JavaTextAreaPainter.java b/java/src/processing/mode/java/pdex/JavaTextAreaPainter.java
@@ -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 @@ protected void paintLine(Graphics gfx, int line, int x,
    * @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 void setECSandTheme(ErrorCheckerService ecs, JavaMode mode) {
 
     gutterTextFont = mode.getFont("editor.gutter.text.font");
     gutterTextColor = mode.getColor("editor.gutter.text.color");
+    gutterLineHighlightColor = mode.getColor("editor.gutter.linehighlight.color");
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@ private boolean placeTabs(int left, int right, Graphics2D g) {`
`410`	`410`	`if (code.isModified()) {`
`411`	`411`	`g.setColor(modifiedColor);`
`412`	`412`	`//g.drawLine(tab.left + NOTCH, top, tab.right - NOTCH, top);`
`413`		`- g.drawLine(tab.left, TAB_TOP, tab.right, TAB_TOP);`
	`413`	`+ g.drawLine(tab.left + (i == 0 ? CURVE_RADIUS : 0), TAB_TOP, tab.right, TAB_TOP);`
`414`	`414`	`}`
`415`	`415`	`}`
`416`	`416`