8313424: JavaFX controls in the title bar

buildSrc/win.gradle

@@ -324,9 +324,9 @@ WIN.glass.rcFlags = [
 WIN.glass.ccFlags = [ccFlags].flatten()
 WIN.glass.linker = linker
 WIN.glass.linkFlags = (IS_STATIC_BUILD ? [linkFlags] : [linkFlags, "delayimp.lib", "gdi32.lib", "urlmon.lib", "Comdlg32.lib",
-        "winmm.lib", "imm32.lib", "shell32.lib", "Uiautomationcore.lib", "dwmapi.lib", "uxtheme.lib",
+        "winmm.lib", "imm32.lib", "shell32.lib", "Uiautomationcore.lib", "dwmapi.lib",
         "/DELAYLOAD:user32.dll", "/DELAYLOAD:urlmon.dll", "/DELAYLOAD:winmm.dll", "/DELAYLOAD:shell32.dll",
-        "/DELAYLOAD:Uiautomationcore.dll", "/DELAYLOAD:dwmapi.dll", "/DELAYLOAD:uxtheme.dll"]).flatten()
+        "/DELAYLOAD:Uiautomationcore.dll", "/DELAYLOAD:dwmapi.dll"]).flatten()
 WIN.glass.lib = "glass"
 
 WIN.decora = [:]

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

@@ -163,6 +163,8 @@ protected void _releaseInput(long ptr) {
 
     private native void _performWindowDrag(long ptr);
 
+    private native void _performTitleBarDoubleClickAction(long ptr);
+
     @Override
     public NonClientHandler getNonClientHandler() {
         return (type, button, x, y, xAbs, yAbs, clickCount) -> {
@@ -173,7 +175,7 @@ public NonClientHandler getNonClientHandler() {
                 View.EventHandler eventHandler = view != null ? view.getEventHandler() : null;
                 if (eventHandler != null && eventHandler.pickDragAreaNode(wx, wy) != null) {
                     if (clickCount == 2) {
-                        maximize(!isMaximized());
+                        _performTitleBarDoubleClickAction(getRawHandle());
                     } else if (clickCount == 1) {
                         _performWindowDrag(getRawHandle());
                     }

modules/javafx.graphics/src/main/native-glass/mac/GlassViewDelegate.m

@@ -1145,9 +1145,7 @@ - (BOOL)suppressMouseEnterExitOnMouseDown
 
 - (void)performWindowDrag
 {
-    if (lastEvent != nil) {
-        [[nsView window] performWindowDragWithEvent:lastEvent];
-    }
+    [[nsView window] performWindowDragWithEvent:[NSApp currentEvent]];
 }
 
 static jstring convertNSStringToJString(id aString, int length)

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

@@ -204,6 +204,10 @@ - (void)windowWillEnterFullScreen:(NSNotification *)notification
     NSUInteger mask = [self->nsWindow styleMask];
     self->isWindowResizable = ((mask & NSWindowStyleMaskResizable) != 0);
     [[self->view delegate] setResizableForFullscreen:YES];
+
+    if (nsWindow.toolbar != nil) {
+        nsWindow.toolbar.visible = NO;
+    }
 }
 
 - (void)windowDidEnterFullScreen:(NSNotification *)notification
@@ -222,6 +226,10 @@ - (void)windowDidExitFullScreen:(NSNotification *)notification
 {
     //NSLog(@"windowDidExitFullScreen");
 
+    if (nsWindow.toolbar != nil) {
+        nsWindow.toolbar.visible = YES;
+    }
+
     GlassViewDelegate* delegate = (GlassViewDelegate*)[self->view delegate];
     [delegate setResizableForFullscreen:self->isWindowResizable];
 

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

@@ -1502,6 +1502,33 @@ static jlong _createWindowCommonDo(JNIEnv *env, jobject jWindow, jlong jOwnerPtr
     GLASS_CHECK_EXCEPTION(env);
 }
 
+/*
+ * Class:     com_sun_glass_ui_mac_MacWindow
+ * Method:    _performTitleBarDoubleClickAction
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_sun_glass_ui_mac_MacWindow__1performTitleBarDoubleClickAction
+(JNIEnv *env, jobject jWindow, jlong jPtr)
+{
+    LOG("Java_com_sun_glass_ui_mac_MacWindow__1performTitleBarDoubleClickAction");
+    if (!jPtr) return;
+
+    GLASS_ASSERT_MAIN_JAVA_THREAD(env);
+    GLASS_POOL_ENTER;
+    {
+        GlassWindow *window = getGlassWindow(env, jPtr);
+        NSString* action = [NSUserDefaults.standardUserDefaults stringForKey:@"AppleActionOnDoubleClick"];
+
+        if ([action isEqualToString:@"Minimize"]) {
+            [window->nsWindow performMiniaturize:nil];
+        } else if ([action isEqualToString:@"Maximize"]) {
+            [window->nsWindow performZoom:nil];
+        }
+    }
+    GLASS_POOL_EXIT;
+    GLASS_CHECK_EXCEPTION(env);
+}
+
 /*
  * Class:     com_sun_glass_ui_mac_MacWindow
  * Method:    _setToolbarStyle

modules/javafx.graphics/src/test/addExports

@@ -56,6 +56,7 @@
 --add-opens javafx.graphics/javafx.scene.layout=ALL-UNNAMED
 --add-opens javafx.graphics/javafx.scene.paint=ALL-UNNAMED
 --add-opens javafx.graphics/javafx.stage=ALL-UNNAMED
+--add-opens java.desktop/javax.imageio=ALL-UNNAMED
 #
 # compile time additions
 --add-exports=javafx.base/com.sun.javafx.runtime=ALL-UNNAMED