8313424: JavaFX controls in the title bar

modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacWindow.java

@@ -184,10 +184,12 @@ protected void onHeaderBarHeightChanged(double height) {
     private void updateWindowOverlayMetrics(NSWindowToolbarStyle toolbarStyle) {
         double minHeight = NSWindowToolbarStyle.SMALL.size.getHeight();
         var empty = new Dimension2D(0, 0);
+        var size = isUtilityWindow() ? toolbarStyle.utilitySize : toolbarStyle.size;
+
         WindowControlsMetrics metrics = isUsingNonClientOverlay()
             ? _isRightToLeftLayoutDirection()
-                ? new WindowControlsMetrics(empty, toolbarStyle.size, minHeight)
-                : new WindowControlsMetrics(toolbarStyle.size, empty, minHeight)
+                ? new WindowControlsMetrics(empty, size, minHeight)
+                : new WindowControlsMetrics(size, empty, minHeight)
             : new WindowControlsMetrics(empty, empty, minHeight);
 
         windowControlsMetrics.set(metrics);
@@ -200,10 +202,12 @@ private enum NSWindowToolbarStyle {
 
         NSWindowToolbarStyle(double width, double height, int style) {
             this.size = new Dimension2D(width, height);
+            this.utilitySize = new Dimension2D(height, height); // width intentionally set to height
             this.style = style;
         }
 
         final Dimension2D size;
+        final Dimension2D utilitySize;
         final int style;
 
         static NSWindowToolbarStyle ofHeight(double height) {

modules/javafx.graphics/src/main/java/com/sun/javafx/scene/layout/HeaderButtonBehavior.java

@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2025, 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 com.sun.javafx.scene.layout;
+
+import com.sun.javafx.PlatformUtil;
+import javafx.beans.value.ObservableValue;
+import javafx.event.EventHandler;
+import javafx.scene.Node;
+import javafx.scene.Scene;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.HeaderButtonType;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import javafx.util.Subscription;
+import java.util.Objects;
+import java.util.Optional;
+
+public final class HeaderButtonBehavior implements EventHandler<MouseEvent> {
+
+    private final Node node;
+    private final HeaderButtonType type;
+    private final Subscription subscription;
+
+    public HeaderButtonBehavior(Node node, HeaderButtonType type) {
+        this.node = Objects.requireNonNull(node);
+        this.type = Objects.requireNonNull(type);
+
+        ObservableValue<Stage> stage = node.sceneProperty()
+            .flatMap(Scene::windowProperty)
+            .map(w -> w instanceof Stage s ? s : null);
+
+        subscription = Subscription.combine(
+            type == HeaderButtonType.MAXIMIZE
+                ? stage.flatMap(Stage::resizableProperty).subscribe(this::onResizableChanged)
+                : Subscription.EMPTY,
+            stage.flatMap(Stage::fullScreenProperty).subscribe(this::onFullScreenChanged),
+            () -> node.removeEventHandler(MouseEvent.MOUSE_RELEASED, this)
+        );
+
+        node.addEventHandler(MouseEvent.MOUSE_RELEASED, this);
+        node.setFocusTraversable(false);
+    }
+
+    public void dispose() {
+        subscription.unsubscribe();
+    }
+
+    @Override
+    public void handle(MouseEvent event) {
+        if (!node.getLayoutBounds().contains(event.getX(), event.getY())) {
+            return;
+        }
+
+        switch (type) {
+            case CLOSE -> getStage().ifPresent(Stage::close);
+            case ICONIFY -> getStage().ifPresent(stage -> stage.setIconified(true));
+            case MAXIMIZE -> getStage().ifPresent(stage -> {
+                    // On macOS, a non-modal window is put into full-screen mode when the maximize button is clicked,
+                    // but enlarged to cover the desktop when the option key is pressed at the same time.
+                    if (PlatformUtil.isMac() && stage.getModality() == Modality.NONE && !event.isAltDown()) {
+                        stage.setFullScreen(!stage.isFullScreen());
+                    } else {
+                        stage.setMaximized(!stage.isMaximized());
+                    }
+                });
+        }
+    }
+
+    private Optional<Stage> getStage() {
+        Scene scene = node.getScene();
+        if (scene == null) {
+            return Optional.empty();
+        }
+
+        return scene.getWindow() instanceof Stage stage
+            ? Optional.of(stage)
+            : Optional.empty();
+    }
+
+    private void onResizableChanged(Boolean resizable) {
+        if (!node.disableProperty().isBound()) {
+            node.setDisable(resizable == Boolean.FALSE);
+        }
+    }
+
+    private void onFullScreenChanged(Boolean fullScreen) {
+        if (!node.visibleProperty().isBound() && !node.managedProperty().isBound()) {
+            node.setVisible(fullScreen != Boolean.TRUE);
+            node.setManaged(fullScreen != Boolean.TRUE);
+        }
+    }
+}

modules/javafx.graphics/src/main/java/javafx/scene/Scene.java

@@ -3078,7 +3078,7 @@ public HeaderAreaType pickHeaderArea(double x, double y) {
 
                 if (HeaderBarBase.getHeaderButtonType(intersectedNode) instanceof HeaderButtonType type) {
                     return switch (type) {
-                        case MINIMIZE -> HeaderAreaType.MINIMIZE;
+                        case ICONIFY -> HeaderAreaType.MINIMIZE;
                         case MAXIMIZE -> HeaderAreaType.MAXIMIZE;
                         case CLOSE -> HeaderAreaType.CLOSE;
                     };

modules/javafx.graphics/src/main/java/javafx/scene/layout/HeaderBarBase.java

@@ -26,6 +26,7 @@
 package javafx.scene.layout;
 
 import com.sun.glass.ui.WindowControlsMetrics;
+import com.sun.javafx.scene.layout.HeaderButtonBehavior;
 import com.sun.javafx.stage.StageHelper;
 import com.sun.javafx.tk.quantum.WindowStage;
 import javafx.beans.property.ReadOnlyDoubleProperty;
@@ -36,6 +37,7 @@
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.input.ContextMenuEvent;
+import javafx.scene.input.MouseEvent;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.stage.Window;
@@ -92,12 +94,26 @@ public static Boolean isDraggable(Node child) {
 
     /**
      * Specifies the {@code HeaderButtonType} of the child, indicating its semantic use in the header bar.
+     * <p>
+     * This property can be set on any {@link Node}. Specifying a header button type also provides the behavior
+     * associated with the button type. If the default behavior is not desired, applications can register an
+     * event filter on the child node that consumes the {@link MouseEvent#MOUSE_RELEASED} event.
      *
      * @param child the child node
      * @param value the {@code HeaderButtonType}, or {@code null}
      */
     public static void setHeaderButtonType(Node child, HeaderButtonType value) {
         Pane.setConstraint(child, HEADER_BUTTON_TYPE, value);
+
+        if (child.getProperties().get(HeaderButtonBehavior.class) instanceof HeaderButtonBehavior behavior) {
+            behavior.dispose();
+        }
+
+        if (value != null) {
+            child.getProperties().put(HeaderButtonBehavior.class, new HeaderButtonBehavior(child, value));
+        } else {
+            child.getProperties().remove(HeaderButtonBehavior.class);
+        }
     }
 
     /**

modules/javafx.graphics/src/main/java/javafx/scene/layout/HeaderButtonType.java

@@ -32,29 +32,32 @@
  * Identifies the semantic type of a button in a custom {@link HeaderBar}, which enables integrations
  * with the platform window manager. For example, hovering over a {@link #MAXIMIZE} button on Windows
  * will summon snap layouts.
- * <p>
- * This property can be set on any {@link Node}. Applications are still required to provide their own
- * click handlers to programmatically trigger the actions associated with header buttons, i.e. call
- * appropriate stage methods like {@link Stage#setIconified(boolean)}, {@link Stage#setMaximized(boolean)}
- * or {@link Stage#close()}.
  *
  * @since 25
  * @see HeaderBarBase#setHeaderButtonType(Node, HeaderButtonType)
  */
 public enum HeaderButtonType {
+
     /**
-     * Identifies the minimize button.
+     * Identifies the iconify button.
      *
      * @see Stage#isIconified()
      * @see Stage#setIconified(boolean)
      */
-    MINIMIZE,
+    ICONIFY,
 
     /**
      * Identifies the maximize button.
+     * <p>
+     * This button toggles the {@link Stage#isMaximized()} or {@link Stage#isFullScreen()} property,
+     * depending on platform-specific invocation semantics. For example, on macOS the button will
+     * put the window into full-screen mode by default, but maximize it to cover the desktop when
+     * the option key is pressed.
      *
      * @see Stage#isMaximized()
      * @see Stage#setMaximized(boolean)
+     * @see Stage#isFullScreen()
+     * @see Stage#setFullScreen(boolean)
      */
     MAXIMIZE,
 

modules/javafx.graphics/src/main/native-glass/mac/GlassWindow+Overrides.m

@@ -195,6 +195,11 @@ - (void)windowWillEnterFullScreen:(NSNotification *)notification
     self->isWindowResizable = ((mask & NSWindowStyleMaskResizable) != 0);
     [[self->view delegate] setResizableForFullscreen:YES];
 
+    // When we switch to full-screen mode, we always need the standard window buttons to be shown.
+    [[self->nsWindow standardWindowButton:NSWindowCloseButton] setHidden:NO];
+    [[self->nsWindow standardWindowButton:NSWindowMiniaturizeButton] setHidden:NO];
+    [[self->nsWindow standardWindowButton:NSWindowZoomButton] setHidden:NO];
+
     if (nsWindow.toolbar != nil) {
         nsWindow.toolbar.visible = NO;
     }
@@ -210,6 +215,13 @@ - (void)windowDidEnterFullScreen:(NSNotification *)notification
 - (void)windowWillExitFullScreen:(NSNotification *)notification
 {
     //NSLog(@"windowWillExitFullScreen");
+
+    // When we exit full-screen mode, hide the standard window buttons if they were previously hidden.
+    if (!self->isStandardButtonsVisible) {
+        [[self->nsWindow standardWindowButton:NSWindowCloseButton] setHidden:YES];
+        [[self->nsWindow standardWindowButton:NSWindowMiniaturizeButton] setHidden:YES];
+        [[self->nsWindow standardWindowButton:NSWindowZoomButton] setHidden:YES];
+    }
 }
 
 - (void)windowDidExitFullScreen:(NSNotification *)notification

modules/javafx.graphics/src/main/native-glass/mac/GlassWindow.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, 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
@@ -50,6 +50,7 @@
     BOOL                isTransparent;
     BOOL                isDecorated;
     BOOL                isResizable;
+    BOOL                isStandardButtonsVisible;
     BOOL                suppressWindowMoveEvent;
     BOOL                suppressWindowResizeEvent;