59571
|
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
|
|
2 |
--- 5.2.0/jEdit/org/gjt/sp/jedit/textarea/StructureMatcher.java 2015-02-02 02:14:27.000000000 +0100
|
|
3 |
+++ 5.2.0/jEdit-patched/org/gjt/sp/jedit/textarea/StructureMatcher.java 2015-02-28 20:56:32.644328711 +0100
|
58784
|
4 |
@@ -201,8 +201,9 @@
|
|
5 |
int matchEndLine = textArea.getScreenLineOfOffset(
|
|
6 |
match.end);
|
|
7 |
|
|
8 |
- int fontHeight = textArea.getPainter().getFontHeight();
|
|
9 |
- y += textArea.getPainter().getLineExtraSpacing();
|
|
10 |
+ int height = Math.min(
|
|
11 |
+ textArea.getPainter().getLineHeight(), textArea.getPainter().getFontHeight());
|
|
12 |
+ y += Math.max(textArea.getPainter().getLineExtraSpacing(), 0);
|
|
13 |
|
|
14 |
int[] offsets = getOffsets(screenLine,match);
|
|
15 |
int x1 = offsets[0];
|
|
16 |
@@ -210,8 +211,8 @@
|
|
17 |
|
|
18 |
gfx.setColor(textArea.getPainter().getStructureHighlightColor());
|
|
19 |
|
|
20 |
- gfx.drawLine(x1,y,x1,y + fontHeight - 1);
|
|
21 |
- gfx.drawLine(x2,y,x2,y + fontHeight - 1);
|
|
22 |
+ gfx.drawLine(x1,y,x1,y + height - 1);
|
|
23 |
+ gfx.drawLine(x2,y,x2,y + height - 1);
|
|
24 |
|
|
25 |
if(matchStartLine == screenLine || screenLine == 0)
|
|
26 |
gfx.drawLine(x1,y,x2,y);
|
|
27 |
@@ -229,8 +230,8 @@
|
|
28 |
|
|
29 |
if(matchEndLine == screenLine)
|
|
30 |
{
|
|
31 |
- gfx.drawLine(x1,y + fontHeight - 1,
|
|
32 |
- x2,y + fontHeight - 1);
|
|
33 |
+ gfx.drawLine(x1,y + height - 1,
|
|
34 |
+ x2,y + height - 1);
|
|
35 |
}
|
|
36 |
}
|
|
37 |
|