From 5187641e25162a31fe4cd496af9520812bda95b8 Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Tue, 27 Dec 2022 15:29:57 +1100
Subject: [PATCH] Remove C.toggleFullscreen

---
 exp/pkg/application/window.go        |  8 ++++++--
 exp/pkg/application/window_darwin.go | 21 ++++++---------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/exp/pkg/application/window.go b/exp/pkg/application/window.go
index 3c117416b..6c4b2a29e 100644
--- a/exp/pkg/application/window.go
+++ b/exp/pkg/application/window.go
@@ -29,7 +29,6 @@ type (
 		destroy()
 		reload()
 		forceReload()
-		toggleFullscreen()
 		toggleDevTools()
 		resetZoom()
 		zoomIn()
@@ -380,7 +379,11 @@ func (w *Window) ToggleFullscreen() {
 	if w.impl == nil {
 		return
 	}
-	w.impl.toggleFullscreen()
+	if w.IsFullscreen() {
+		w.UnFullscreen()
+	} else {
+		w.Fullscreen()
+	}
 }
 
 func (w *Window) ToggleDevTools() {
@@ -467,6 +470,7 @@ func (w *Window) Maximise() *Window {
 		return w
 	}
 	if !w.IsMaximised() {
+		w.disableSizeConstraints()
 		w.impl.maximise()
 	}
 	return w
diff --git a/exp/pkg/application/window_darwin.go b/exp/pkg/application/window_darwin.go
index f79647bff..aa3da4243 100644
--- a/exp/pkg/application/window_darwin.go
+++ b/exp/pkg/application/window_darwin.go
@@ -338,27 +338,22 @@ bool windowIsMinimised(void* nsWindow) {
 	return [(NSWindow*)nsWindow isMiniaturized];
 }
 
-// toggle fullscreen
-void windowToggleFullscreen(void* nsWindow) {
-	// Toggle fullscreen on main thread
-	dispatch_async(dispatch_get_main_queue(), ^{
-		[(NSWindow*)nsWindow toggleFullScreen:nil];
-	});
-}
-
 // Set Window fullscreen
 void windowFullscreen(void* nsWindow) {
 	if( windowIsFullscreen(nsWindow) ) {
 		return;
 	}
-	windowToggleFullscreen(nsWindow);
-}
+	dispatch_async(dispatch_get_main_queue(), ^{
+		[(NSWindow*)nsWindow toggleFullScreen:nil];
+	});}
 
 void windowUnFullscreen(void* nsWindow) {
 	if( !windowIsFullscreen(nsWindow) ) {
 		return;
 	}
-	windowToggleFullscreen(nsWindow);
+	dispatch_async(dispatch_get_main_queue(), ^{
+		[(NSWindow*)nsWindow toggleFullScreen:nil];
+	});
 }
 
 // restore window to normal size
@@ -773,10 +768,6 @@ func (w *macosWindow) toggleDevTools() {
 	showDevTools(w.nsWindow)
 }
 
-func (w *macosWindow) toggleFullscreen() {
-	C.windowToggleFullscreen(w.nsWindow)
-}
-
 func (w *macosWindow) reload() {
 	//TODO: Implement
 	println("reload called on Window", w.parent.id)