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

Wayland: slightly improved fix for issue #878

Browse Source
This commit is contained in:
ManoloFLTK 2024-05-10 14:43:48 +02:00
parent 25ffce6cdf
commit 7b76552d18
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -833,6 +833,27 @@ static void use_FLTK_toplevel_configure_cb(struct libdecor_frame *frame) {
#endif // LIBDECOR_MR131
// does win entirely cover its parent ?
static void does_window_cover_parent(Fl_Window *win) {
Fl_Window *parent = win->window();
fl_wl_xid(parent)->covered = (win->x() <= 0 && win->y() <= 0 &&
win->w() >= parent->w() && win->h() >= parent->h());
}
// recursively explore all shown subwindows in a window and call f for each
static void scan_subwindows(Fl_Group *g, void (*f)(Fl_Window *)) {
for (int i = 0; i < g->children(); i++) {
Fl_Widget *o = g->child(i);
if (o->as_window()) {
if (!o->as_window()->shown()) continue;
f(o->as_window());
}
if (o->as_group()) scan_subwindows(o->as_group(), f);
}
}
static void handle_configure(struct libdecor_frame *frame,
struct libdecor_configuration *configuration, void *user_data)
{
@ -892,6 +913,9 @@ static void handle_configure(struct libdecor_frame *frame,
}
} else { width = height = 0; }
}
if (is_2nd_run && Fl_Wayland_Screen_Driver::compositor == Fl_Wayland_Screen_Driver::MUTTER) {
scan_subwindows(window->fl_win, does_window_cover_parent); // issue #878
}
if (window->fl_win->fullscreen_active() &&
Fl_Window_Driver::driver(window->fl_win)->force_position()) {
@ -1741,27 +1765,6 @@ int Fl_Wayland_Window_Driver::set_cursor_4args(const Fl_RGB_Image *rgb, int hotx
}
// does win entirely cover its parent ?
static void does_window_cover_parent(Fl_Window *win) {
Fl_Window *parent = win->window();
fl_wl_xid(parent)->covered = (win->x() <= 0 && win->y() <= 0 &&
win->w() >= parent->w() && win->h() >= parent->h());
}
// recursively explore all shown subwindows in a window and call f for each
static void scan_subwindows(Fl_Group *g, void (*f)(Fl_Window *)) {
for (int i = 0; i < g->children(); i++) {
Fl_Widget *o = g->child(i);
if (o->as_window()) {
if (!o->as_window()->shown()) continue;
f(o->as_window());
}
if (o->as_group()) scan_subwindows(o->as_group(), f);
}
}
void Fl_Wayland_Window_Driver::resize(int X, int Y, int W, int H) {
struct wld_window *fl_win = fl_wl_xid(pWindow);
if (fl_win && fl_win->kind == DECORATED && !xdg_toplevel()) {
@ -1851,11 +1854,6 @@ void Fl_Wayland_Window_Driver::resize(int X, int Y, int W, int H) {
if (fl_win && fl_win->kind == SUBWINDOW && fl_win->subsurface)
checkSubwindowFrame(); // make sure subwindow doesn't leak outside parent
if (Fl_Wayland_Screen_Driver::compositor == Fl_Wayland_Screen_Driver::MUTTER &&
fl_win && is_a_resize && fl_win->kind == DECORATED) { // fix for issue #878
scan_subwindows(pWindow, does_window_cover_parent);
}
}