8267546: Add CSS themes as a first-class concept

modules/javafx.controls/src/main/java/javafx/scene/control/Control.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,10 +93,8 @@ public StringProperty skinClassNameProperty(Control control) {
             }
         });
 
-        // Ensures that the default application user agent stylesheet is loaded
-        if (Application.getUserAgentStylesheet() == null) {
-            PlatformImpl.setDefaultPlatformUserAgentStylesheet();
-        }
+        // Ensures that the default theme is loaded
+        PlatformImpl.ensureDefaultTheme();
     }
 
     /**

modules/javafx.controls/src/main/java/javafx/scene/control/PopupControl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -84,10 +84,8 @@ public class PopupControl extends PopupWindow implements Skinnable, Styleable {
     public static final double USE_COMPUTED_SIZE = -1;
 
     static {
-        // Ensures that the default application user agent stylesheet is loaded
-        if (Application.getUserAgentStylesheet() == null) {
-            PlatformImpl.setDefaultPlatformUserAgentStylesheet();
-        }
+        // Ensures that the default theme is loaded
+        PlatformImpl.ensureDefaultTheme();
     }
 
     /**

modules/javafx.controls/src/main/java/javafx/scene/control/theme/CaspianTheme.java

@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package javafx.scene.control.theme;
+
+import com.sun.javafx.PlatformUtil;
+import com.sun.javafx.application.PlatformImpl;
+import javafx.application.ConditionalFeature;
+import javafx.application.Platform;
+import javafx.beans.value.WritableValue;
+
+/**
+ * {@code Caspian} is a built-in JavaFX theme that shipped as default in JavaFX 2.
+ *
+ * @since 21
+ */
+public class CaspianTheme extends ThemeBase {
+
+    private final WritableValue<String> highContrastStylesheet;
+
+    /**
+     * Creates a new instance of the {@code CaspianTheme} class.
+     */
+    public CaspianTheme() {
+        addLast("com/sun/javafx/scene/control/skin/caspian/caspian.css");
+
+        if (PlatformImpl.isSupported(ConditionalFeature.INPUT_TOUCH)) {
+            addLast("com/sun/javafx/scene/control/skin/caspian/embedded.css");
+
+            if (com.sun.javafx.util.Utils.isQVGAScreen()) {
+                addLast("com/sun/javafx/scene/control/skin/caspian/embedded-qvga.css");
+            }
+
+            if (PlatformUtil.isAndroid()) {
+                addLast("com/sun/javafx/scene/control/skin/caspian/android.css");
+            }
+
+            if (PlatformUtil.isIOS()) {
+                addLast("com/sun/javafx/scene/control/skin/caspian/ios.css");
+            }
+        }
+
+        if (PlatformImpl.isSupported(ConditionalFeature.TWO_LEVEL_FOCUS)) {
+            addLast("com/sun/javafx/scene/control/skin/caspian/two-level-focus.css");
+        }
+
+        if (PlatformImpl.isSupported(ConditionalFeature.VIRTUAL_KEYBOARD)) {
+            addLast("com/sun/javafx/scene/control/skin/caspian/fxvk.css");
+        }
+
+        if (!PlatformImpl.isSupported(ConditionalFeature.TRANSPARENT_WINDOW)) {
+            addLast("com/sun/javafx/scene/control/skin/caspian/caspian-no-transparency.css");
+        }
+
+        highContrastStylesheet = addLast(null);
+        updateHighContrastTheme();
+    }
+
+    @Override
+    protected void onPreferencesChanged() {
+        updateHighContrastTheme();
+    }
+
+    private void updateHighContrastTheme() {
+        boolean enabled = false;
+        String overrideThemeName = System.getProperty("com.sun.javafx.highContrastTheme");
+        if (overrideThemeName != null) {
+            enabled = true;
+        }
+
+        if (!enabled) {
+            Platform.Preferences preferences = Platform.getPreferences();
+            if (preferences.getBoolean("Windows.SPI.HighContrastOn", false)) {
+                enabled = preferences.getString("Windows.SPI.HighContrastColorScheme") != null;
+            }
+        }
+
+        if (enabled) {
+            // caspian has only one high contrast theme, use it regardless of the user or platform theme.
+            highContrastStylesheet.setValue("com/sun/javafx/scene/control/skin/caspian/highcontrast.css");
+        } else {
+            highContrastStylesheet.setValue(null);
+        }
+    }
+
+}

modules/javafx.controls/src/main/java/javafx/scene/control/theme/ModenaTheme.java

@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package javafx.scene.control.theme;
+
+import com.sun.javafx.PlatformUtil;
+import com.sun.javafx.application.HighContrastScheme;
+import com.sun.javafx.application.PlatformImpl;
+import javafx.application.ConditionalFeature;
+import javafx.application.Platform;
+import javafx.beans.value.WritableValue;
+import java.util.ResourceBundle;
+
+/**
+ * {@code Modena} is the default built-in JavaFX theme as of JavaFX 8.
+ *
+ * @since 21
+ */
+public class ModenaTheme extends ThemeBase {
+
+    private final WritableValue<String> highContrastStylesheet;
+
+    /**
+     * Creates a new instance of the {@code ModenaTheme} class.
+     */
+    public ModenaTheme() {
+        addLast("com/sun/javafx/scene/control/skin/modena/modena.css");
+
+        if (PlatformImpl.isSupported(ConditionalFeature.INPUT_TOUCH)) {
+            addLast("com/sun/javafx/scene/control/skin/modena/touch.css");
+        }
+
+        if (PlatformUtil.isEmbedded()) {
+            addLast("com/sun/javafx/scene/control/skin/modena/modena-embedded-performance.css");
+        }
+
+        if (PlatformUtil.isAndroid()) {
+            addLast("com/sun/javafx/scene/control/skin/modena/android.css");
+        }
+
+        if (PlatformUtil.isIOS()) {
+            addLast("com/sun/javafx/scene/control/skin/modena/ios.css");
+        }
+
+        if (PlatformImpl.isSupported(ConditionalFeature.TWO_LEVEL_FOCUS)) {
+            addLast("com/sun/javafx/scene/control/skin/modena/two-level-focus.css");
+        }
+
+        if (PlatformImpl.isSupported(ConditionalFeature.VIRTUAL_KEYBOARD)) {
+            addLast("com/sun/javafx/scene/control/skin/caspian/fxvk.css");
+        }
+
+        if (!PlatformImpl.isSupported(ConditionalFeature.TRANSPARENT_WINDOW)) {
+            addLast("com/sun/javafx/scene/control/skin/modena/modena-no-transparency.css");
+        }
+
+        highContrastStylesheet = addLast(null);
+        updateHighContrastTheme();
+    }
+
+    @Override
+    protected void onPreferencesChanged() {
+        updateHighContrastTheme();
+    }
+
+    private void updateHighContrastTheme() {
+        String themeName = null;
+        String overrideThemeName = System.getProperty("com.sun.javafx.highContrastTheme");
+        if (overrideThemeName != null) {
+            themeName = overrideThemeName;
+        }
+
+        if (themeName == null) {
+            Platform.Preferences preferences = Platform.getPreferences();
+            if (preferences.getBoolean("Windows.SPI.HighContrastOn", false)) {
+                themeName = preferences.getString("Windows.SPI.HighContrastColorScheme");
+            }
+        }
+
+        if (themeName != null) {
+            String stylesheet = switch (themeName.toUpperCase()) {
+                case "BLACKONWHITE" -> "com/sun/javafx/scene/control/skin/modena/blackOnWhite.css";
+                case "WHITEONBLACK" -> "com/sun/javafx/scene/control/skin/modena/whiteOnBlack.css";
+                case "YELLOWONBLACK" -> "com/sun/javafx/scene/control/skin/modena/yellowOnBlack.css";
+                default -> null;
+            };
+
+            if (stylesheet == null) {
+                ResourceBundle bundle = ResourceBundle.getBundle("com/sun/glass/ui/win/themes");
+                String enumValue = HighContrastScheme.fromThemeName(bundle::getString, themeName);
+
+                stylesheet = enumValue != null ? switch (HighContrastScheme.valueOf(enumValue)) {
+                    case HIGH_CONTRAST_WHITE -> "com/sun/javafx/scene/control/skin/modena/blackOnWhite.css";
+                    case HIGH_CONTRAST_BLACK -> "com/sun/javafx/scene/control/skin/modena/whiteOnBlack.css";
+                    case HIGH_CONTRAST_1, HIGH_CONTRAST_2 -> "com/sun/javafx/scene/control/skin/modena/yellowOnBlack.css";
+                } : null;
+            }
+
+            highContrastStylesheet.setValue(stylesheet);
+        } else {
+            highContrastStylesheet.setValue(null);
+        }
+    }
+
+}