From db50e573906c60858488e3b59374a3778e82903b Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Wed, 18 Mar 2026 10:20:37 +0100 Subject: [PATCH] Wayland: Fix resize of menutitle windows when across 2 screens with diverse scaling. --- CHANGES.txt | 2 +- src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 9bb7dac7b..3ab5253d4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -30,7 +30,7 @@ Changes in FLTK 1.4.5 Released: xxx xx 2026 - Wayland: don't call non-public libdecor_frame_get_content_{width,height} (#1296) - Wayland: Some shortcut keys not delivered when input widget has focus (#1290) - X11: Restore use of menubar at top of fullscreen window - - X11: Fix resize of menutitle windows when across 2 screens with diverse scaling + - X11/Wayland: Fix resize of menutitle windows when across 2 screens with diverse scaling - Fix: Underline does not appear in some fonts and scales (#1308) - Fix "New Wayland subwindow code creates issues with resizes of opengl windows…" (#1311) diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx index e242ac8d8..f05c837e5 100644 --- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx @@ -723,7 +723,7 @@ static void surface_enter(void *data, struct wl_surface *wl_surface, while (e->next != &window->outputs) e = e->next; // move e to end of linked list wl_list_insert(e, &surface_output->link); //printf("window %p enters screen id=%d length=%d\n", window->fl_win, output->id, wl_list_length(&window->outputs)); - if (list_was_empty) { + if (list_was_empty && !window->fl_win->parent() && !window->fl_win->menu_window()) { change_scale(output, window, pre_scale); } }