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

Fix "Wayland: subwindows seem to grab scaling factor from primary monitor" (#1382)

Browse Source
This commit is contained in:
ManoloFLTK 2026-03-18 09:40:02 +01:00
parent 82e02270ee
commit 4da0e2a3f8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -20,6 +20,7 @@ Changes in FLTK 1.4.5 Released: xxx xx 2026
- Wayland: Fix "Long Tooltips can crash ..." (#1317)
- Wayland: Fix NULL pointer dereference in Fl::cairo_make_current() (#1359)
- Wayland: Fix crash in test/sudoku if ALSA soundlib is not available
- Wayland: subwindows may grab scaling factor from wrong monitor (#1382)
- X11: Fix crash with menubar across 2 screens with diverse scale factors (#1380)
- X11: Fl::enable_im() crashes without input methods (#1364)
@ -29,6 +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
- Fix: Underline does not appear in some fonts and scales (#1308)
- Fix "New Wayland subwindow code creates issues with resizes of opengl
windows…" (#1311)

2
src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
View File

@ -2119,7 +2119,7 @@ void Fl_Wayland_Window_Driver::menu_window_area(int &X, int &Y, int &W, int &H,
int Fl_Wayland_Window_Driver::wld_scale() {
Fl_X *flx = Fl_X::flx(pWindow);
Fl_X *flx = Fl_X::flx(pWindow->top_window());
struct wld_window *xid = (flx ? (struct wld_window *)flx->xid : NULL);
if (!xid || wl_list_empty(&xid->outputs)) {
int scale = 1;