angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-13 23:37:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

macOS large title bar: hide NSToolbar of window title bar when window becomes full screen

Browse Source
This commit is contained in:
Karl Tauber
2023-12-12 17:22:18 +01:00
parent ea2447dcb7
commit 241fe855cc
1 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
flatlaf-natives/flatlaf-natives-macos/src/main/objcpp/MacWindow.mm
View File

@@ -15,6 +15,7 @@
*/ */
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import <objc/runtime.h>
#import <jni.h> #import <jni.h>
#import "JNIUtils.h" #import "JNIUtils.h"
#import "JNFRunLoop.h" #import "JNFRunLoop.h"
@@ -98,9 +99,13 @@ JNIEXPORT void JNICALL Java_com_formdev_flatlaf_ui_FlatNativeMacLibrary_setWindo
if( nsWindow == NULL ) if( nsWindow == NULL )
return; return;
if( hasToolbar == (nsWindow.toolbar != NULL) )
return;
[FlatJNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){ [FlatJNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
NSLog( @"\n%@\n\n", [nsWindow.contentView.superview _subtreeDescription] ); NSLog( @"\n%@\n\n", [nsWindow.contentView.superview _subtreeDescription] );
// add/remove toolbar
NSToolbar* toolbar = NULL; NSToolbar* toolbar = NULL;
if( hasToolbar ) { if( hasToolbar ) {
toolbar = [NSToolbar new]; toolbar = [NSToolbar new];
@@ -108,9 +113,42 @@ JNIEXPORT void JNICALL Java_com_formdev_flatlaf_ui_FlatNativeMacLibrary_setWindo
} }
nsWindow.toolbar = toolbar; nsWindow.toolbar = toolbar;
// TODO handle fullscreen
NSLog( @"\n%@\n\n", [nsWindow.contentView.superview _subtreeDescription] ); NSLog( @"\n%@\n\n", [nsWindow.contentView.superview _subtreeDescription] );
// when window becomes full screen, it is necessary to hide the toolbar
// because it otherwise is shown non-transparent and hides Swing components
static char enterObserverKey;
static char exitObserverKey;
NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
if( hasToolbar ) {
NSLog( @"add observers %@", nsWindow );
id enterObserver = [center addObserverForName:NSWindowWillEnterFullScreenNotification
object:nsWindow queue:nil usingBlock:^(NSNotification *note) {
NSLog( @"enter full screen %@", nsWindow );
if( nsWindow.toolbar != NULL )
nsWindow.toolbar.visible = NO;
}];
id exitObserver = [center addObserverForName:NSWindowDidExitFullScreenNotification
object:nsWindow queue:nil usingBlock:^(NSNotification *note) {
NSLog( @"exit full screen %@", nsWindow );
if( nsWindow.toolbar != NULL )
nsWindow.toolbar.visible = YES;
}];
objc_setAssociatedObject( nsWindow, &enterObserverKey, enterObserver, OBJC_ASSOCIATION_RETAIN_NONATOMIC );
objc_setAssociatedObject( nsWindow, &exitObserverKey, exitObserver, OBJC_ASSOCIATION_RETAIN_NONATOMIC );
} else {
NSLog( @"remove observers %@", nsWindow );
id enterObserver = objc_getAssociatedObject( nsWindow, &enterObserverKey );
id exitObserver = objc_getAssociatedObject( nsWindow, &exitObserverKey );
if( enterObserver != NULL ) {
[center removeObserver:enterObserver];
objc_setAssociatedObject( nsWindow, &enterObserverKey, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC );
}
if( exitObserver != NULL ) {
[center removeObserver:exitObserver];
objc_setAssociatedObject( nsWindow, &exitObserverKey, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC );
}
}
}]; }];
JNI_COCOA_EXIT() JNI_COCOA_EXIT()