author | wenzelm |
Sun, 24 Feb 2019 12:49:32 +0100 | |
changeset 69838 | 4419d4d675c3 |
parent 67992 | 752a4e6d760c |
child 71932 | 65fd0f032a75 |
permissions | -rw-r--r-- |
67992 | 1 |
diff -ru 5.5.0/jEdit/org/gjt/sp/jedit/syntax/Chunk.java 5.5.0/jEdit-patched/org/gjt/sp/jedit/syntax/Chunk.java |
2 |
--- 5.5.0/jEdit/org/gjt/sp/jedit/syntax/Chunk.java 2018-04-09 01:57:24.000000000 +0200 |
|
69838
4419d4d675c3
formal update of patches -- no change of content;
wenzelm
parents:
67992
diff
changeset
|
3 |
+++ 5.5.0/jEdit-patched/org/gjt/sp/jedit/syntax/Chunk.java 2019-02-24 12:32:09.336643045 +0100 |
67992 | 4 |
@@ -322,9 +322,9 @@ |
50306 | 5 |
//{{{ Package private members |
6 |
||
7 |
//{{{ Instance variables |
|
8 |
- SyntaxStyle style; |
|
9 |
+ public SyntaxStyle style; |
|
10 |
// set up after init() |
|
11 |
- float width; |
|
12 |
+ public float width; |
|
13 |
//}}} |
|
14 |
||
15 |
//{{{ Chunk constructor |
|
67992 | 16 |
@@ -572,7 +572,7 @@ |
48786 | 17 |
// this is either style.getBackgroundColor() or |
18 |
// styles[defaultID].getBackgroundColor() |
|
19 |
private Color background; |
|
20 |
- private String str; |
|
21 |
+ public String str; |
|
50306 | 22 |
private GlyphVector[] glyphs; |
23 |
//}}} |
|
24 |
||
67992 | 25 |
diff -ru 5.5.0/jEdit/org/gjt/sp/jedit/textarea/TextArea.java 5.5.0/jEdit-patched/org/gjt/sp/jedit/textarea/TextArea.java |
26 |
--- 5.5.0/jEdit/org/gjt/sp/jedit/textarea/TextArea.java 2018-04-09 01:58:01.000000000 +0200 |
|
69838
4419d4d675c3
formal update of patches -- no change of content;
wenzelm
parents:
67992
diff
changeset
|
27 |
+++ 5.5.0/jEdit-patched/org/gjt/sp/jedit/textarea/TextArea.java 2019-02-24 12:20:10.550459878 +0100 |
65329 | 28 |
@@ -917,6 +917,11 @@ |
61511 | 29 |
return chunkCache.getLineInfo(screenLine).physicalLine; |
30 |
} //}}} |
|
31 |
||
32 |
+ public Chunk getChunksOfScreenLine(int screenLine) |
|
33 |
+ { |
|
34 |
+ return chunkCache.getLineInfo(screenLine).chunks; |
|
35 |
+ } |
|
36 |
+ |
|
37 |
//{{{ getScreenLineOfOffset() method |
|
38 |
/** |
|
39 |
* Returns the screen (wrapped) line containing the specified offset. |
|
67992 | 40 |
diff -ru 5.5.0/jEdit/org/gjt/sp/util/SyntaxUtilities.java 5.5.0/jEdit-patched/org/gjt/sp/util/SyntaxUtilities.java |
41 |
--- 5.5.0/jEdit/org/gjt/sp/util/SyntaxUtilities.java 2018-04-09 01:58:37.000000000 +0200 |
|
69838
4419d4d675c3
formal update of patches -- no change of content;
wenzelm
parents:
67992
diff
changeset
|
42 |
+++ 5.5.0/jEdit-patched/org/gjt/sp/util/SyntaxUtilities.java 2019-02-24 12:20:10.550459878 +0100 |
65329 | 43 |
@@ -200,7 +200,24 @@ |
48786 | 44 |
{ |
45 |
return loadStyles(family,size,true); |
|
46 |
} |
|
47 |
- |
|
48 |
+ |
|
49 |
+ /** |
|
50 |
+ * Extended styles derived from the user-specified style array. |
|
51 |
+ */ |
|
52 |
+ |
|
53 |
+ public static class StyleExtender |
|
54 |
+ { |
|
55 |
+ public SyntaxStyle[] extendStyles(SyntaxStyle[] styles) |
|
56 |
+ { |
|
57 |
+ return styles; |
|
58 |
+ } |
|
59 |
+ } |
|
60 |
+ volatile private static StyleExtender _styleExtender = new StyleExtender(); |
|
61 |
+ public static void setStyleExtender(StyleExtender ext) |
|
62 |
+ { |
|
63 |
+ _styleExtender = ext; |
|
64 |
+ } |
|
65 |
+ |
|
66 |
/** |
|
67 |
* Loads the syntax styles from the properties, giving them the specified |
|
68 |
* base font family and size. |
|
65329 | 69 |
@@ -230,9 +247,11 @@ |
48786 | 70 |
Log.log(Log.ERROR,StandardUtilities.class,e); |
71 |
} |
|
72 |
} |
|
73 |
- |
|
74 |
- return styles; |
|
61746
3df1b6a5837c
paint gutter text on base line of main text area, to accomodate extra line spacing without special tricks (see also jEdit bug #3717 and its fix in SVN 23977, which does not quite work: odd jumping positions on vertical cursor movement);
wenzelm
parents:
61511
diff
changeset
|
75 |
+ styles[0] = |
3df1b6a5837c
paint gutter text on base line of main text area, to accomodate extra line spacing without special tricks (see also jEdit bug #3717 and its fix in SVN 23977, which does not quite work: odd jumping positions on vertical cursor movement);
wenzelm
parents:
61511
diff
changeset
|
76 |
+ new SyntaxStyle(org.gjt.sp.jedit.jEdit.getColorProperty("view.fgColor", Color.BLACK), |
3df1b6a5837c
paint gutter text on base line of main text area, to accomodate extra line spacing without special tricks (see also jEdit bug #3717 and its fix in SVN 23977, which does not quite work: odd jumping positions on vertical cursor movement);
wenzelm
parents:
61511
diff
changeset
|
77 |
+ null, new Font(family, 0, size)); |
48786 | 78 |
+ return _styleExtender.extendStyles(styles); |
79 |
} //}}} |
|
80 |
- |
|
81 |
+ |
|
82 |
private SyntaxUtilities(){} |
|
83 |
} |