8291087: Wrong position of focus of screen reader on Windows with scr…

…een scale > 1 Reviewed-by: aghaisas, arapte
openjdk · Aug 9, 2022 · 38324a7 · 38324a7 · openjdk-notifier · Aug 9, 2022
1 parent b4d86bd
commit 38324a7
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 8 deletions.
diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/win/WinAccessible.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/win/WinAccessible.java
@@ -40,7 +40,11 @@
 import javafx.scene.Scene;
 import javafx.scene.input.KeyCombination;
 import com.sun.glass.ui.Accessible;
+import com.sun.glass.ui.Screen;
 import com.sun.glass.ui.View;
+import com.sun.javafx.stage.WindowHelper;
+import com.sun.javafx.tk.TKStage;
+import com.sun.javafx.tk.quantum.WindowStage;
 import static javafx.scene.AccessibleAttribute.*;
 
 /*
@@ -877,6 +881,27 @@ private WinVariant GetPropertyValue(int propertyId) {
         return variant;
     }
 
+    private Screen getScreen() {
+        Scene scene = (Scene) getAttribute(SCENE);
+        if (scene == null || scene.getWindow() == null) return null;
+        TKStage tkStage = WindowHelper.getPeer(scene.getWindow());
+        if (!(tkStage instanceof WindowStage)) return null;
+        WindowStage windowStage = (WindowStage) tkStage;
+        if (windowStage.getPlatformWindow() == null) return null;
+        return windowStage.getPlatformWindow().getScreen();
+    }
+
+    float[] getPlatformBounds(float x, float y, float w, float h) {
+        float[] platformBounds = new float[] { x, y, w, h };
+        Screen screen = getScreen();
+        if (screen == null) return platformBounds;
+        platformBounds[0] = screen.toPlatformX(x);
+        platformBounds[1] = screen.toPlatformY(y);
+        platformBounds[2] = (float) Math.ceil(w * screen.getPlatformScaleX());
+        platformBounds[3] = (float) Math.ceil(h * screen.getPlatformScaleY());
+        return platformBounds;
+    }
+
     /***********************************************/
     /*       IRawElementProviderFragment           */
     /***********************************************/
@@ -887,8 +912,10 @@ private float[] get_BoundingRectangle() {
 
         Bounds bounds = (Bounds)getAttribute(BOUNDS);
         if (bounds != null) {
-            return new float[] {(float)bounds.getMinX(), (float)bounds.getMinY(),
-                                (float)bounds.getWidth(), (float)bounds.getHeight()};
+            return getPlatformBounds((float) bounds.getMinX(),
+                                     (float) bounds.getMinY(),
+                                     (float) bounds.getWidth(),
+                                     (float) bounds.getHeight());
         }
         return null;
     }

diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/win/WinTextRangeProvider.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/win/WinTextRangeProvider.java
@@ -326,10 +326,16 @@ private double[] GetBoundingRectangles() {
             int index = 0;
             for (int i = 0; i < bounds.length; i++) {
                 Bounds b = bounds[i];
-                result[index++] = b.getMinX();
-                result[index++] = b.getMinY();
-                result[index++] = b.getWidth();
-                result[index++] = b.getHeight();
+                float[] platformBounds = accessible.getPlatformBounds(
+                        (float) b.getMinX(),
+                        (float) b.getMinY(),
+                        (float) b.getWidth(),
+                        (float) b.getHeight());
+
+                result[index++] = platformBounds[0];
+                result[index++] = platformBounds[1];
+                result[index++] = platformBounds[2];
+                result[index++] = platformBounds[3];
             }
             return result;
         }

diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java
@@ -55,7 +55,7 @@
 import java.util.ResourceBundle;
 import static com.sun.javafx.FXPermissions.*;
 
-class WindowStage extends GlassStage {
+public class WindowStage extends GlassStage {
 
     protected Window platformWindow;
 
@@ -223,7 +223,7 @@ private void computeAndSetBackground(List<javafx.scene.paint.Stop> stops) {
         }
     }
 
-    final Window getPlatformWindow() {
+    public final Window getPlatformWindow() {
         return platformWindow;
     }