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

fix logic issues and find nearest point

Browse Source
This commit is contained in:
Ben Fry
2015-08-21 15:15:51 -04:00
parent 889b9352ec
commit 345e043527
2 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
java/src/processing/mode/java/MarkerColumn.java
View File

@@ -158,17 +158,13 @@ public class MarkerColumn extends JPanel {
/** Find out which error/warning the user has clicked and scroll to it */
void scrollToMarkerAt(final int y) {
private void scrollToMarkerAt(final int y) {
try {
new SwingWorker<Object, Object>() {
new SwingWorker() {
protected Object doInBackground() throws Exception {
for (LineMarker m : errorPoints) {
// -2 and +2 are extra allowance, clicks in the
// vicinity of the markers register that way
if (Math.abs(y - m.getY()) < 3) {
editor.getErrorChecker().scrollToErrorLine(m.getProblem());
return null;
}
LineMarker m = findClosestMarker(y);
if (m != null) {
editor.getErrorChecker().scrollToErrorLine(m.getProblem());
}
return null;
}
@@ -180,20 +176,18 @@ public class MarkerColumn extends JPanel {
/** Show tooltip on hover. */
void showMarkerHover(final int y) {
private void showMarkerHover(final int y) {
try {
new SwingWorker<Object, Object>() {
new SwingWorker() {
protected Object doInBackground() throws Exception {
for (LineMarker m : errorPoints) {
if (Math.abs(y - m.getY()) < 3) {
Problem p = m.getProblem();
String kind = p.isError() ?
Language.text("editor.status.error") :
Language.text("editor.status.warning");
setToolTipText(kind + ": " + p.getMessage());
setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
break;
}
LineMarker m = findClosestMarker(y);
if (m != null) {
Problem p = m.getProblem();
String kind = p.isError() ?
Language.text("editor.status.error") :
Language.text("editor.status.warning");
setToolTipText(kind + ": " + p.getMessage());
setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
}
return null;
}
@@ -204,6 +198,20 @@ public class MarkerColumn extends JPanel {
}
private LineMarker findClosestMarker(final int y) {
LineMarker closest = null;
int closestDist = Integer.MAX_VALUE;
for (LineMarker m : errorPoints) {
int dist = Math.abs(y - m.getY());
if (dist < 3 && dist < closestDist) {
closest = m;
closestDist = dist;
}
}
return closest;
}
public Dimension getPreferredSize() {
return new Dimension(WIDE, super.getPreferredSize().height);
}