WIP

mstr2 · Oct 18, 2024 · 2063df3 · 2063df3
1 parent 13630a3
commit 2063df3
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacWindow.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacWindow.java
@@ -181,13 +181,19 @@ public NonClientHandler getNonClientHandler() {
         };
     }
 
+    private native boolean _isRightToLeftLayoutDirection();
+
     private ObservableValue<WindowOverlayMetrics> windowOverlayMetrics;
 
     @Override
     public ObservableValue<WindowOverlayMetrics> windowOverlayMetrics() {
         if (windowOverlayMetrics == null) {
+            HorizontalDirection direction = _isRightToLeftLayoutDirection()
+                ? HorizontalDirection.RIGHT
+                : HorizontalDirection.LEFT;
+
             windowOverlayMetrics = ObjectConstant.valueOf(
-                new WindowOverlayMetrics(HorizontalDirection.LEFT, new Dimension2D(78, 38)));
+                new WindowOverlayMetrics(direction, new Dimension2D(78, 38)));
         }
 
         return windowOverlayMetrics;

diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassWindow.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassWindow.m
@@ -1500,4 +1500,29 @@ static jlong _createWindowCommonDo(JNIEnv *env, jobject jWindow, jlong jOwnerPtr
     }
     GLASS_POOL_EXIT;
     GLASS_CHECK_EXCEPTION(env);
-}
+}
+
+/*
+ * Class:     com_sun_glass_ui_mac_MacWindow
+ * Method:    _isRightToLeftLayoutDirection
+ * Signature: ()Z;
+ */
+JNIEXPORT jboolean JNICALL Java_com_sun_glass_ui_mac_MacWindow__1isRightToLeftLayoutDirection
+(JNIEnv *env, jobject self)
+{
+    LOG("Java_com_sun_glass_ui_mac_MacWindow__1isRightToLeftLayoutDirection");
+    jboolean result = false;
+
+    GLASS_ASSERT_MAIN_JAVA_THREAD(env);
+    GLASS_POOL_ENTER;
+    {
+        NSString* preferredLanguage = [[NSLocale preferredLanguages] objectAtIndex:0];
+        NSLocale* locale = [NSLocale localeWithLocaleIdentifier:preferredLanguage];
+        NSString* languageCode = [locale objectForKey:NSLocaleLanguageCode];
+        result = [NSLocale characterDirectionForLanguage:languageCode] == NSLocaleLanguageDirectionRightToLeft;
+    }
+    GLASS_POOL_EXIT;
+    GLASS_CHECK_EXCEPTION(env);
+
+    return result;
+}