Merge pull request #3903 from JakubValtar/error-marker-column

benfry · benfry · commit bc169f841005 · 2015-09-29T17:12:15.000-04:00
Error markers stay next to lines in short sketches
diff --git a/java/src/processing/mode/java/MarkerColumn.java b/java/src/processing/mode/java/MarkerColumn.java
@@ -39,6 +39,7 @@
 import processing.app.Sketch;
 import processing.app.SketchCode;
 import processing.app.Util;
+import processing.core.PApplet;
 import processing.mode.java.pdex.LineMarker;
 import processing.mode.java.pdex.Problem;
 import processing.app.Language;
@@ -207,12 +208,15 @@ private void recalculateMarkerPositions() {
 	      e.printStackTrace();
 	      totalLines = 1; // do not divide by zero
 	    }
+	    int visibleLines = editor.getTextArea().getVisibleLines();
+	    totalLines = PApplet.max(totalLines, visibleLines);
 
 	    for (LineMarker m : errorPoints) {
 	      // Ratio of error line to total lines
 	      float y = (m.getLineNumber() + 1) / ((float) totalLines);
 	      // Ratio multiplied by height of the error bar
-	      y *= getHeight() - 15; // -15 is just a vertical offset
+	      y *= getHeight();
+	      y -= 15; // -15 is just a vertical offset
 
 	      m.setY((int) y);
 	    }
