gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fullscreen window loses sys menu bar if 2nd window is opened (#924)

Browse Source
This commit is contained in:
ManoloFLTK 2024-03-04 19:43:17 +01:00
parent a0ff3f6f5c
commit ad7d1dc1c6
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Fl_MacOS_Sys_Menu_Bar.mm
View File

@ -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();
}

5
src/Fl_cocoa.mm
View File

@ -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);