WIP

mstr2 · Oct 4, 2024 · 55cca80 · 55cca80
1 parent 15fcee6
commit 55cca80
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 1 deletion.
diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java
@@ -444,7 +444,9 @@ public Map<String, PreferenceMapping<?>> getPlatformKeyMappings() {
         return Map.of(
             "macOS.NSColor.textColor", new PreferenceMapping<>("foregroundColor", Color.class),
             "macOS.NSColor.textBackgroundColor", new PreferenceMapping<>("backgroundColor", Color.class),
-            "macOS.NSColor.controlAccentColor", new PreferenceMapping<>("accentColor", Color.class)
+            "macOS.NSColor.controlAccentColor", new PreferenceMapping<>("accentColor", Color.class),
+            "macOS.NSWorkspace.accessibilityDisplayShouldReduceMotion", new PreferenceMapping<>("reducedMotion", Boolean.class),
+            "macOS.NSWorkspace.accessibilityDisplayShouldReduceTransparency", new PreferenceMapping<>("reducedTransparency", Boolean.class)
         );
     }
 

diff --git a/modules/javafx.graphics/src/main/java/javafx/application/Platform.java b/modules/javafx.graphics/src/main/java/javafx/application/Platform.java
@@ -549,6 +549,8 @@ public static Preferences getPreferences() {
      *         <tr><td>{@code macOS.NSColor.systemRedColor}</td><td>{@link Color}</td></tr>
      *         <tr><td>{@code macOS.NSColor.systemTealColor}</td><td>{@link Color}</td></tr>
      *         <tr><td>{@code macOS.NSColor.systemYellowColor}</td><td>{@link Color}</td></tr>
+     *         <tr><td>{@code macOS.NSWorkspace.accessibilityDisplayShouldReduceMotion}</td><td>{@link Boolean}</td></tr>
+     *         <tr><td>{@code macOS.NSWorkspace.accessibilityDisplayShouldReduceTransparency}</td><td>{@link Boolean}</td></tr>
      *         <tr></tr>
      *     </tbody>
      * </table>

diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassApplication.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassApplication.m
@@ -245,6 +245,12 @@ - (void)applicationWillFinishLaunching:(NSNotification *)aNotification
                                                                          name:@"AppleColorPreferencesChangedNotification"
                                                                          object:nil];
 
+                        [[[NSWorkspace sharedWorkspace] notificationCenter]
+                            addObserver:self
+                            selector:@selector(platformPreferencesDidChange)
+                            name:NSWorkspaceAccessibilityDisplayOptionsDidChangeNotification
+                            object:nil];
+
                         // localMonitor = [NSEvent addLocalMonitorForEventsMatchingMask: NSRightMouseDownMask
                         //                                                      handler:^(NSEvent *incomingEvent) {
                         //                                                          NSEvent *result = incomingEvent;

diff --git a/modules/javafx.graphics/src/main/native-glass/mac/PlatformSupport.m b/modules/javafx.graphics/src/main/native-glass/mac/PlatformSupport.m
@@ -106,6 +106,16 @@ + (jobject)collectPreferences {
     [PlatformSupport queryNSColors:preferences];
     [NSAppearance setCurrentAppearance:lastAppearance];
 
+    bool reduceMotion = [[NSWorkspace sharedWorkspace] accessibilityDisplayShouldReduceMotion];
+    [PlatformSupport putBoolean:preferences
+                     key:"macOS.NSWorkspace.accessibilityDisplayShouldReduceMotion"
+                     value:reduceMotion];
+
+    bool reduceTransparency = [[NSWorkspace sharedWorkspace] accessibilityDisplayShouldReduceTransparency];
+    [PlatformSupport putBoolean:preferences
+                     key:"macOS.NSWorkspace.accessibilityDisplayShouldReduceTransparency"
+                     value:reduceTransparency];
+
     return preferences;
 }
 
@@ -222,6 +232,19 @@ + (void)updatePreferences:(jobject)application {
     (*env)->DeleteLocalRef(env, newPreferences);
 }
 
++ (void)putBoolean:(jobject)preferences key:(const char*)key value:(bool)value {
+    GET_MAIN_JENV;
+
+    jobject prefKey = (*env)->NewStringUTF(env, key);
+    GLASS_CHECK_NONNULL_EXCEPTION_RETURN(env, prefKey);
+
+    jobject prefValue = (*env)->GetStaticObjectField(env, jBooleanClass, value ? jBooleanTRUE : jBooleanFALSE);
+    GLASS_CHECK_NONNULL_EXCEPTION_RETURN(env, prefValue);
+
+    (*env)->CallObjectMethod(env, preferences, jMapPutMethod, prefKey, prefValue);
+    GLASS_CHECK_EXCEPTION(env);
+}
+
 + (void)putString:(jobject)preferences key:(const char*)key value:(const char*)value {
     GET_MAIN_JENV;