From b8821875eded970b4c5e1fb7d4509ea64e759444 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Thu, 30 May 2024 09:52:23 +0200 Subject: [PATCH] Revert "app: [macOS] ensure the Window is initalized before Run functions" This reverts commit 5083a2330176f99b23d219b870c3dafdd354ce18 because Option and Run no longer create the window. Signed-off-by: Elias Naur --- app/os_macos.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/os_macos.go b/app/os_macos.go index 427009ad..cb27f942 100644 --- a/app/os_macos.go +++ b/app/os_macos.go @@ -326,7 +326,6 @@ type window struct { cursor pointer.Cursor pointerBtns pointer.Buttons loop *eventLoop - initialized bool scale float32 config Config @@ -834,9 +833,7 @@ func (w *window) draw() { func (w *window) ProcessEvent(e event.Event) { w.w.ProcessEvent(e) - if w.initialized { - w.loop.FlushEvents() - } + w.loop.FlushEvents() } func (w *window) Event() event.Event { @@ -927,6 +924,7 @@ func newWindow(win *callbacks, options []Option) { } w.loop = newEventLoop(w.w, w.wakeup) win.SetDriver(w) + res <- struct{}{} if err := w.init(); err != nil { w.ProcessEvent(DestroyEvent{Err: err}) return @@ -944,9 +942,6 @@ func newWindow(win *callbacks, options []Option) { nextTopLeft = C.cascadeTopLeftFromPoint(window, nextTopLeft) // makeKeyAndOrderFront assumes ownership of our window reference. C.makeKeyAndOrderFront(window) - w.initialized = true - res <- struct{}{} - w.loop.FlushEvents() }) <-res }