Backport fc5df4ac8f11f25611bd4def5b655578af27c882

Author: duke

src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java

@@ -882,8 +882,15 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
                     }
                 }
                 if (icon != null) {
-                    icon.paintIcon(c, g, x + VistaMenuItemCheckIconFactory.getIconWidth(),
-                                   y + OFFSET);
+                    if (WindowsGraphicsUtils.isLeftToRight(c)) {
+                        icon.paintIcon(c, g,
+                                       x + VistaMenuItemCheckIconFactory.getIconWidth(),
+                                       y + OFFSET);
+                    } else {
+                        icon.paintIcon(c, g,
+                                       x - VistaMenuItemCheckIconFactory.getIconWidth() + 2 * OFFSET,
+                                       y + OFFSET);
+                    }
                 }
             }
             private static WindowsMenuItemUIAccessor getAccessor(

src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java

@@ -43,6 +43,7 @@
 import javax.swing.JComponent;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
+import javax.swing.SwingConstants;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.UIResource;
@@ -215,8 +216,17 @@ static void paintMenuItem(WindowsMenuItemUIAccessor accessor, Graphics g,
 
         if (lh.getCheckIcon() != null && lh.useCheckAndArrow()) {
             Rectangle rect = lr.getTextRect();
-
-            rect.x += lh.getAfterCheckIconGap();
+            if (menuItem.getComponentOrientation().isLeftToRight()) {
+                if (menuItem.getHorizontalTextPosition() != SwingConstants.LEADING
+                    && menuItem.getHorizontalTextPosition() != SwingConstants.LEFT) {
+                    rect.x += lh.getAfterCheckIconGap();
+                }
+            } else {
+                if (menuItem.getHorizontalTextPosition() != SwingConstants.LEADING
+                    && menuItem.getHorizontalTextPosition() != SwingConstants.RIGHT) {
+                    rect.x -= lh.getAfterCheckIconGap();
+                }
+            }
 
             lr.setTextRect(rect);
         }
@@ -232,7 +242,11 @@ static void paintMenuItem(WindowsMenuItemUIAccessor accessor, Graphics g,
         }
         if (lh.getCheckIcon() != null && lh.useCheckAndArrow()) {
             Rectangle rect = lr.getAccRect();
-            rect.x += lh.getAfterCheckIconGap();
+            if (menuItem.getComponentOrientation().isLeftToRight()) {
+                rect.x += lh.getAfterCheckIconGap();
+            } else {
+                rect.x -= lh.getAfterCheckIconGap();
+            }
             lr.setAccRect(rect);
         }
         SwingUtilities3.paintAccText(g, lh, lr, disabledForeground,

test/jdk/javax/swing/JMenuItem/RightLeftOrientation.java

@@ -45,7 +45,7 @@
 
 /*
  * @test id=windows
- * @bug 4211052
+ * @bug 4211052 8370465
  * @requires (os.family == "windows")
  * @summary Verifies if menu items lay out correctly when their
  *     ComponentOrientation property is set to RIGHT_TO_LEFT.
@@ -155,6 +155,16 @@ static void addMenuItems(JMenu menu, ComponentOrientation o) {
         menuItem.setHorizontalTextPosition(SwingConstants.LEADING);
         menu.add(menuItem);
 
+        menuItem = new JMenuItem("Text to the left", new MyMenuItemIcon());
+        menuItem.setComponentOrientation(o);
+        menuItem.setHorizontalTextPosition(SwingConstants.LEFT);
+        menu.add(menuItem);
+
+        menuItem = new JMenuItem("Text to the right", new MyMenuItemIcon());
+        menuItem.setComponentOrientation(o);
+        menuItem.setHorizontalTextPosition(SwingConstants.RIGHT);
+        menu.add(menuItem);
+
         menuItem = new JRadioButtonMenuItem("Radio Button Menu Item");
         menuItem.setComponentOrientation(o);
         menuItem.setSelected(true);