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

Wayland: fix interactive moving and resizing of a subwindow (#987)

Browse Source
This commit is contained in:
ManoloFLTK 2024-06-03 09:50:41 +02:00
parent d792ed21f5
commit ce46b4b68b
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1784,11 +1784,12 @@ void Fl_Wayland_Window_Driver::resize(int X, int Y, int W, int H) {
}
int is_a_move = (X != x() || Y != y());
bool true_rescale = Fl_Window::is_a_rescale();
float f = Fl::screen_scale(pWindow->screen_num());
if (fl_win && fl_win->buffer) {
float scale = Fl::screen_scale(pWindow->screen_num()) * wld_scale();
int scale = wld_scale();
int stride = cairo_format_stride_for_width(
Fl_Cairo_Graphics_Driver::cairo_format, int(W * scale) );
size_t bsize = stride * int(H * scale);
Fl_Cairo_Graphics_Driver::cairo_format, int(W * f) * scale );
size_t bsize = stride * int(H * f) * scale;
true_rescale = (bsize != fl_win->buffer->draw_buffer.data_size);
}
int is_a_resize = (W != w() || H != h() || true_rescale);
@ -1811,7 +1812,6 @@ void Fl_Wayland_Window_Driver::resize(int X, int Y, int W, int H) {
}
if (shown()) {
float f = Fl::screen_scale(pWindow->screen_num());
if (is_a_resize) {
if (pWindow->as_overlay_window() && other_xid) {
destroy_double_buffer();
@ -1861,14 +1861,18 @@ void Fl_Wayland_Window_Driver::resize(int X, int Y, int W, int H) {
Fl::e_state = 0;
}
} else if (fl_win->kind == SUBWINDOW && fl_win->subsurface) {
wl_subsurface_set_position(fl_win->subsurface, pWindow->x() * f, pWindow->y() * f);
wl_subsurface_set_position(fl_win->subsurface, X * f, Y * f);
}
}
}
if (fl_win && fl_win->kind == SUBWINDOW && fl_win->subsurface)
if (fl_win && fl_win->kind == SUBWINDOW && fl_win->subsurface) {
Fl_Window *parent = pWindow->window();
struct wld_window *xid = fl_wl_xid(parent);
if (xid) wl_surface_commit(xid->wl_surface);
checkSubwindowFrame(); // make sure subwindow doesn't leak outside parent
}
}
static void crect_intersect(cairo_rectangle_int_t *to, cairo_rectangle_int_t *with) {