src/Tools/jEdit/patches/structure_matcher
author wenzelm
Tue, 09 Jun 2015 12:32:01 +0200
changeset 60403 9be917b2f376
parent 59571 1081f91c0662
permissions -rw-r--r--
tuned signature;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
59571
1081f91c0662 updated to jedit-5.2.0;
wenzelm
parents: 58784
diff changeset
     1
diff -ru 5.2.0/jEdit/org/gjt/sp/jedit/textarea/StructureMatcher.java 5.2.0/jEdit-patched/org/gjt/sp/jedit/textarea/StructureMatcher.java
1081f91c0662 updated to jedit-5.2.0;
wenzelm
parents: 58784
diff changeset
     2
--- 5.2.0/jEdit/org/gjt/sp/jedit/textarea/StructureMatcher.java	2015-02-02 02:14:27.000000000 +0100
1081f91c0662 updated to jedit-5.2.0;
wenzelm
parents: 58784
diff changeset
     3
+++ 5.2.0/jEdit-patched/org/gjt/sp/jedit/textarea/StructureMatcher.java	2015-02-28 20:56:32.644328711 +0100
58784
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
     4
@@ -201,8 +201,9 @@
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
     5
 			int matchEndLine = textArea.getScreenLineOfOffset(
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
     6
 				match.end);
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
     7
 
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
     8
-			int fontHeight = textArea.getPainter().getFontHeight();
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
     9
-			y += textArea.getPainter().getLineExtraSpacing();
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    10
+			int height = Math.min(
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    11
+				textArea.getPainter().getLineHeight(), textArea.getPainter().getFontHeight());
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    12
+			y += Math.max(textArea.getPainter().getLineExtraSpacing(), 0);
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    13
 
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    14
 			int[] offsets = getOffsets(screenLine,match);
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    15
 			int x1 = offsets[0];
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    16
@@ -210,8 +211,8 @@
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    17
 
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    18
 			gfx.setColor(textArea.getPainter().getStructureHighlightColor());
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    19
 
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    20
-			gfx.drawLine(x1,y,x1,y + fontHeight - 1);
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    21
-			gfx.drawLine(x2,y,x2,y + fontHeight - 1);
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    22
+			gfx.drawLine(x1,y,x1,y + height - 1);
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    23
+			gfx.drawLine(x2,y,x2,y + height - 1);
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    24
 
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    25
 			if(matchStartLine == screenLine || screenLine == 0)
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    26
 				gfx.drawLine(x1,y,x2,y);
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    27
@@ -229,8 +230,8 @@
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    28
 
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    29
 			if(matchEndLine == screenLine)
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    30
 			{
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    31
-				gfx.drawLine(x1,y + fontHeight - 1,
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    32
-					     x2,y + fontHeight - 1);
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    33
+				gfx.drawLine(x1,y + height - 1,
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    34
+					     x2,y + height - 1);
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    35
 			}
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    36
 		}
11d726ce599e support negative extraLineSpacing;
wenzelm
parents:
diff changeset
    37