Extend to Windows11 and later

prsadhuk · Feb 13, 2025 · 7fac9e0 · 7fac9e0
1 parent 46a1cb5
commit 7fac9e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java
@@ -660,7 +660,8 @@ protected void paintMenuItem(Graphics g, JComponent c,
         paintCheckIcon(g, lh, lr, holdc, foreground);
         paintIcon(g, lh, lr, holdc);
         if (UIManager.getLookAndFeel().getName().equals("Windows")
-            && System.getProperty("os.name").equals("Windows 11")
+            && (Integer.parseInt(System.getProperty("os.name").
+                replaceAll("[^0-9]", "")) >= 11)
             && lh.getCheckIcon() != null && lh.useCheckAndArrow()) {
             Rectangle rect = lr.getTextRect();
             if (menuItem.getIcon() != null) {

diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java
@@ -849,8 +849,8 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
                 assert menuItem == null || c == menuItem;
                 Icon icon = getIcon();
                 int skinWidth = -1;
-                boolean isWindows11 = System.getProperty("os.name").
-                                                         equals("Windows 11");
+                boolean isWindows11OrLater = Integer.parseInt(System.getProperty("os.name").
+                                                  replaceAll("[^0-9]", "")) >= 11;
                 if (type == JCheckBoxMenuItem.class
                       || type == JRadioButtonMenuItem.class) {
                     AbstractButton b = (AbstractButton) c;
@@ -876,7 +876,7 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
                         if (xp != null) {
                             Skin skin;
                             skin =  xp.getSkin(c, backgroundPart);
-                            if (!isWindows11) {
+                            if (!isWindows11OrLater) {
                                 skin.paintSkin(g, x, y,
                                         getIconWidth(), getIconHeight(), backgroundState);
                                 if (icon == null) {
@@ -894,7 +894,7 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
                     }
                 }
                 if (icon != null) {
-                    if (!isWindows11) {
+                    if (!isWindows11OrLater) {
                         icon.paintIcon(c, g, x + OFFSET, y + OFFSET);
                     } else {
                         icon.paintIcon(c, g, x - OFFSET +