Mercurial Mercurial > repos > isabelle / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/Tools/jEdit/patches/gutter
author wenzelm
Sat, 11 Jun 2016 17:36:49 +0200
changeset 63287 0835067b9b39
parent 61746 3df1b6a5837c
permissions -rw-r--r--
tuned order for isar-ref;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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:
diff changeset 
     1
 
diff -ru 5.3.0/jEdit-orig/org/gjt/sp/jedit/textarea/Gutter.java 5.3.0/jEdit-patched/org/gjt/sp/jedit/textarea/Gutter.java
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:
diff changeset 
     2
 
--- 5.3.0/jEdit-orig/org/gjt/sp/jedit/textarea/Gutter.java	2015-10-20 19:56:03.000000000 +0200
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:
diff changeset 
     3
 
+++ 5.3.0/jEdit-patched/org/gjt/sp/jedit/textarea/Gutter.java	2015-11-24 21:58:47.686343684 +0100
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:
diff changeset 
     4
 
@@ -185,8 +185,6 @@
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:
diff changeset 
     5
 
 		}
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:
diff changeset 
     6
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:
diff changeset 
     7
 
 		int y = clip.y - clip.y % lineHeight;
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:
diff changeset 
     8
 
-		if (y == 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:
diff changeset 
     9
 
-			y = textArea.getPainter().getLineExtraSpacing();
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:
diff changeset 
    10
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:
diff changeset 
    11
 
 		extensionMgr.paintScreenLineRange(textArea,gfx,
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:
diff changeset 
    12
 
 			firstLine,lastLine,y,lineHeight);
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:
diff changeset 
    13
 
@@ -725,7 +723,7 @@
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:
diff changeset 
    14
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:
diff changeset 
    15
 
 		FontMetrics textAreaFm = textArea.getPainter().getFontMetrics();
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:
diff changeset 
    16
 
 		int lineHeight = textArea.getPainter().getLineHeight();
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:
diff changeset 
    17
 
-		int baseline = textAreaFm.getAscent();
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:
diff changeset 
    18
 
+		int baseline = lineHeight - (textAreaFm.getLeading()+1) - textAreaFm.getDescent();
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:
diff changeset 
    19
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:
diff changeset 
    20
 
 		ChunkCache.LineInfo info = textArea.chunkCache.getLineInfo(line);
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:
diff changeset 
    21
 
 		int physicalLine = info.physicalLine;
isabelle