From ad7d1dc1c64f47ccfaf84d03aeb31af29232e184 Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Mon, 4 Mar 2024 19:43:17 +0100
Subject: Fullscreen window loses sys menu bar if 2nd window is opened (#924)

---
 src/Fl_MacOS_Sys_Menu_Bar.mm | 2 ++
 src/Fl_cocoa.mm              | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Fl_MacOS_Sys_Menu_Bar.mm b/src/Fl_MacOS_Sys_Menu_Bar.mm
index 1240dc837..1caabcaaa 100644
--- a/src/Fl_MacOS_Sys_Menu_Bar.mm
+++ b/src/Fl_MacOS_Sys_Menu_Bar.mm
@@ -569,6 +569,8 @@ static void minimize_win_cb(Fl_Widget *, void *data)
 
 static void window_menu_cb(Fl_Widget *, void *data)
 {
+  Fl_Window *top = Fl::first_window();
+  if (top && top->fullscreen_active()) return;
   if (data) ((Fl_Window*)data)->show();
 }
 
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 9def92f70..a469ed49a 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -3305,7 +3305,6 @@ void Fl_Cocoa_Window_Driver::fullscreen_off(int X, int Y, int W, int H) {
 #  if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
     FLWindow *nswin = fl_xid(pWindow);
     [nswin toggleFullScreen:nil];
-    [nswin setStyleMask:calc_win_style(pWindow)]; //10.6
     pWindow->resize(*no_fullscreen_x(), *no_fullscreen_y(), *no_fullscreen_w(), *no_fullscreen_h());
 #  endif
   } else if (fl_mac_os_version >= 100600) {
@@ -3997,6 +3996,8 @@ static PrintWithTitlebarItem *print_with_titlebar_item = NULL;
 }
 - (void)showPanel
 {
+  Fl_Window *top = Fl::first_window();
+  if (top && top->fullscreen_active()) return;
     NSDictionary *options;
     options = [NSDictionary dictionaryWithObjectsAndKeys:
                [[[NSAttributedString alloc]
@@ -4007,6 +4008,8 @@ static PrintWithTitlebarItem *print_with_titlebar_item = NULL;
 }
 - (void)printPanel
 {
+  Fl_Window *top = Fl::first_window();
+  if (top && top->fullscreen_active()) return;
   bool grab_decoration = ([print_with_titlebar_item state] == NSControlStateValueOn);
   fl_lock_function();
   fl_print_or_copy_window(Fl::first_window(), grab_decoration, 1);
-- 
cgit v1.2.3