Fix Mac: "Merge All Windows" fails if focused window is borderless (#1100)

This commit is contained in:
ManoloFLTK 2024-11-02 07:37:43 +01:00
parent 7ce5b74e12
commit b3a6838128

View File

@ -594,6 +594,8 @@ static void move_tab_cb(Fl_Widget *, void *data)
static void merge_all_windows_cb(Fl_Widget *, void *) static void merge_all_windows_cb(Fl_Widget *, void *)
{ {
Fl_Window *first = Fl::first_window(); Fl_Window *first = Fl::first_window();
while (first && (first->parent() || !first->border()))
first = Fl::next_window(first);
if (first) { if (first) {
[(NSWindow*)fl_xid(first) mergeAllWindows:nil]; [(NSWindow*)fl_xid(first) mergeAllWindows:nil];
} }