From 34d5b26512da2821751bf4b388a203e2ae94d970 Mon Sep 17 00:00:00 2001 From: Jakub Valtar Date: Tue, 29 Sep 2015 17:08:40 -0400 Subject: [PATCH] Error markers stay next to lines in short sketches --- java/src/processing/mode/java/MarkerColumn.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/java/src/processing/mode/java/MarkerColumn.java b/java/src/processing/mode/java/MarkerColumn.java index 875388b2c..6086f1065 100644 --- a/java/src/processing/mode/java/MarkerColumn.java +++ b/java/src/processing/mode/java/MarkerColumn.java @@ -39,6 +39,7 @@ import processing.app.Mode; 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; @@ -205,12 +206,15 @@ public class MarkerColumn extends JPanel { 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); }