[ jEdit-commits ] SF.net SVN: jedit:[24023] jEdit/trunk/org/gjt/sp/jedit/menu

[<mak...@us...>]

Revision: 24023
          http://sourceforge.net/p/jedit/svn/24023
Author:   makarius
Date:     2015-08-14 19:17:19 +0000 (Fri, 14 Aug 2015)
Log Message:
-----------
More accurate font metrics, without any special tricks.

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/menu/EnhancedCheckBoxMenuItem.java
    jEdit/trunk/org/gjt/sp/jedit/menu/EnhancedMenuItem.java
    jEdit/trunk/org/gjt/sp/jedit/menu/MarkersProvider.java

Modified: jEdit/trunk/org/gjt/sp/jedit/menu/EnhancedCheckBoxMenuItem.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/menu/EnhancedCheckBoxMenuItem.java	2015-08-14 18:45:58 UTC (rev 24022)
+++ jEdit/trunk/org/gjt/sp/jedit/menu/EnhancedCheckBoxMenuItem.java	2015-08-14 19:17:19 UTC (rev 24023)
@@ -124,9 +124,7 @@
 			Insets insets = getInsets();
 			g.drawString(shortcut,getWidth() - (fm.stringWidth(
 				shortcut) + insets.right + insets.left + 5),
-				getFont().getSize() + (insets.top - 
-				(OperatingSystem.isMacOSLF() ? 0 : 1))
-				/* XXX magic number */);
+				fm.getAscent() + insets.top);
 		}
 	} //}}}
 

Modified: jEdit/trunk/org/gjt/sp/jedit/menu/EnhancedMenuItem.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/menu/EnhancedMenuItem.java	2015-08-14 18:45:58 UTC (rev 24022)
+++ jEdit/trunk/org/gjt/sp/jedit/menu/EnhancedMenuItem.java	2015-08-14 19:17:19 UTC (rev 24023)
@@ -117,9 +117,7 @@
 			Insets insets = getInsets();
 			g.drawString(shortcut,getWidth() - (fm.stringWidth(
 				shortcut) + insets.right + insets.left + 5),
-				getFont().getSize() + (insets.top - 
-				(OperatingSystem.isMacOSLF() ? 0 : 1))
-				/* XXX magic number */);
+				fm.getAscent() + insets.top);
 		}
 	} //}}}
 

Modified: jEdit/trunk/org/gjt/sp/jedit/menu/MarkersProvider.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/menu/MarkersProvider.java	2015-08-14 18:45:58 UTC (rev 24022)
+++ jEdit/trunk/org/gjt/sp/jedit/menu/MarkersProvider.java	2015-08-14 19:17:19 UTC (rev 24023)
@@ -138,8 +138,7 @@
 				Insets insets = getInsets();
 				g.drawString(shortcut,getWidth() - (fm.stringWidth(
 					shortcut) + insets.right + insets.left + 5),
-					getFont().getSize() + (insets.top - 1)
-					/* XXX magic number */);
+					fm.getAscent() + insets.top);
 			}
 		} //}}}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.