changeset 630:b5b7ec629a50

6735918: test/closed/javax/swing/JMenuItem/6458123/bug6458123.java fails on Linux Summary: All the bearings-related code is removed from MenuItemLayoutHelper class Reviewed-by: alexp
author mlapshin
date Tue, 12 Aug 2008 12:52:10 +0400
parents 5504518c0d1d
children c9d407ab2309
files src/share/classes/sun/swing/MenuItemLayoutHelper.java
diffstat 1 files changed, 0 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/swing/MenuItemLayoutHelper.java	Mon Aug 11 16:49:46 2008 +0400
+++ b/src/share/classes/sun/swing/MenuItemLayoutHelper.java	Tue Aug 12 12:52:10 2008 +0400
@@ -572,9 +572,6 @@
 
         alignRects(lr, alignment);
 
-        // Take into account the left side bearings for text and accelerator text.
-        fixTextRects(lr);
-
         // Set Y coordinate for text and icon.
         // Y coordinates for other rects
         // will be calculated later in layoutMenuItem.
@@ -607,10 +604,6 @@
 
         alignRects(lr, alignment);
 
-        // Take into account the left side bearing for accelerator text.
-        // The LSB for text is taken into account in layoutCompoundLabel() below.
-        fixAccTextRect(lr);
-
         // Center labelRect vertically
         calcLabelYPosition(lr);
 
@@ -645,9 +638,6 @@
 
         alignRects(lr, alignment);
 
-        // Take into account the left side bearings for text and accelerator text.
-        fixTextRects(lr);
-
         // Set Y coordinates for text and icon.
         // Y coordinates for other rects
         // will be calculated later in layoutMenuItem.
@@ -680,10 +670,6 @@
 
         alignRects(lr, alignment);
 
-        // Take into account the left side bearing for accelerator text.
-        // The LSB for text is taken into account in layoutCompoundLabel() below.
-        fixAccTextRect(lr);
-
         // Center labelRect vertically
         calcLabelYPosition(lr);
 
@@ -742,29 +728,6 @@
     }
 
     /**
-     * Takes into account the left side bearings for text and accelerator text
-     */
-    private void fixTextRects(LayoutResult lr) {
-        if (htmlView == null) { // The text isn't a HTML
-            int lsb = SwingUtilities2.getLeftSideBearing(mi, fm, text);
-            if (lsb < 0) {
-                lr.textRect.x -= lsb;
-            }
-        }
-        fixAccTextRect(lr);
-    }
-
-    /**
-     * Takes into account the left side bearing for accelerator text
-     */
-    private void fixAccTextRect(LayoutResult lr) {
-        int lsb = SwingUtilities2.getLeftSideBearing(mi, accFm, accText);
-        if (lsb < 0) {
-            lr.accRect.x -= lsb;
-        }
-    }
-
-    /**
      * Sets Y coordinates of text and icon
      * taking into account the vertical alignment
      */