diff --git a/app/os_macos.go b/app/os_macos.go index 3a01ef25..a8df66b2 100644 --- a/app/os_macos.go +++ b/app/os_macos.go @@ -41,7 +41,7 @@ import ( __attribute__ ((visibility ("hidden"))) void gio_main(void); __attribute__ ((visibility ("hidden"))) CFTypeRef gio_createView(int presentWithTrans); -__attribute__ ((visibility ("hidden"))) CFTypeRef gio_createWindow(CFTypeRef viewRef, CGFloat width, CGFloat height, CGFloat minWidth, CGFloat minHeight, CGFloat maxWidth, CGFloat maxHeight); +__attribute__ ((visibility ("hidden"))) CFTypeRef gio_createWindow(CFTypeRef viewRef, CGFloat width, CGFloat height); __attribute__ ((visibility ("hidden"))) void gio_viewSetHandle(CFTypeRef viewRef, uintptr_t handle); static void writeClipboard(CFTypeRef str) { @@ -192,6 +192,7 @@ static void setMaxSize(CFTypeRef windowRef, CGFloat width, CGFloat height) { @autoreleasepool { NSWindow* window = (__bridge NSWindow *)windowRef; window.contentMaxSize = NSMakeSize(width, height); + window.maxFullScreenContentSize = NSMakeSize(width, height); } } @@ -1010,7 +1011,7 @@ func newWindow(win *callbacks, options []Option) { w.ProcessEvent(DestroyEvent{Err: err}) return } - window := C.gio_createWindow(w.view, C.CGFloat(cnf.Size.X), C.CGFloat(cnf.Size.Y), 0, 0, 0, 0) + window := C.gio_createWindow(w.view, C.CGFloat(cnf.Size.X), C.CGFloat(cnf.Size.Y)) // Release our reference now that the NSWindow has it. C.CFRelease(w.view) w.Configure(options) diff --git a/app/os_macos.m b/app/os_macos.m index d1c4139d..2357adea 100644 --- a/app/os_macos.m +++ b/app/os_macos.m @@ -369,7 +369,7 @@ void gio_setCursor(NSUInteger curID) { } } -CFTypeRef gio_createWindow(CFTypeRef viewRef, CGFloat width, CGFloat height, CGFloat minWidth, CGFloat minHeight, CGFloat maxWidth, CGFloat maxHeight) { +CFTypeRef gio_createWindow(CFTypeRef viewRef, CGFloat width, CGFloat height) { @autoreleasepool { NSRect rect = NSMakeRect(0, 0, width, height); NSUInteger styleMask = NSTitledWindowMask | @@ -381,12 +381,6 @@ CFTypeRef gio_createWindow(CFTypeRef viewRef, CGFloat width, CGFloat height, CGF styleMask:styleMask backing:NSBackingStoreBuffered defer:NO]; - if (minWidth > 0 || minHeight > 0) { - window.contentMinSize = NSMakeSize(minWidth, minHeight); - } - if (maxWidth > 0 || maxHeight > 0) { - window.contentMaxSize = NSMakeSize(maxWidth, maxHeight); - } [window setAcceptsMouseMovedEvents:YES]; NSView *view = (__bridge NSView *)viewRef; [window setContentView:view];