mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wayland + Mutter: fix issue with menubar on fullscreen window (#1061)

Browse Source
This commit is contained in:
ManoloFLTK 2024-09-10 07:50:40 +02:00
parent d70c79b8bc
commit 9b777cc011
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1351,8 +1351,13 @@ bool Fl_Wayland_Window_Driver::process_menu_or_tooltip(struct wld_window *new_wi
xdg_positioner_set_anchor(positioner, XDG_POSITIONER_ANCHOR_BOTTOM_LEFT); xdg_positioner_set_anchor(positioner, XDG_POSITIONER_ANCHOR_BOTTOM_LEFT);
xdg_positioner_set_gravity(positioner, XDG_POSITIONER_GRAVITY_BOTTOM_RIGHT); xdg_positioner_set_gravity(positioner, XDG_POSITIONER_GRAVITY_BOTTOM_RIGHT);
// prevent menuwindow from expanding beyond display limits // prevent menuwindow from expanding beyond display limits
int constraint = XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_SLIDE_X | int constraint = XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_SLIDE_X;
XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_SLIDE_Y; if ( !(origin_win->fullscreen_active() &&
Fl_Wayland_Screen_Driver::compositor == Fl_Wayland_Screen_Driver::MUTTER &&
pWindow->menu_window() && !menu_offset_y(pWindow) && !is_floating_title(pWindow)) ) {
// Condition above is only to bypass Mutter bug for fullscreen windows (see #1061)
constraint |= XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_SLIDE_Y;
}
if (Fl_Window_Driver::menu_bartitle(pWindow) && !Fl_Window_Driver::menu_leftorigin(pWindow)) { if (Fl_Window_Driver::menu_bartitle(pWindow) && !Fl_Window_Driver::menu_leftorigin(pWindow)) {
constraint |= XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_FLIP_Y; constraint |= XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_FLIP_Y;
} }