Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-01 23:06:54 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Wayland: fix interactive moving and resizing of a subwindow - cont'd (#987)

Browse Source
This commit is contained in:
ManoloFLTK
2024-06-27 09:37:50 +02:00
parent b692cc55da
commit 26ea55d5a4
1 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
+16 -11
View File
@@ -1783,12 +1783,12 @@ int Fl_Wayland_Window_Driver::set_cursor_4args(const Fl_RGB_Image *rgb, int hotx
void Fl_Wayland_Window_Driver::resize(int X, int Y, int W, int H) { void Fl_Wayland_Window_Driver::resize(int X, int Y, int W, int H) {
static int depth = 0;
struct wld_window *fl_win = fl_wl_xid(pWindow); struct wld_window *fl_win = fl_wl_xid(pWindow);
if (fl_win && fl_win->kind == DECORATED && !xdg_toplevel()) { if (fl_win && fl_win->kind == DECORATED && !xdg_toplevel()) {
pWindow->wait_for_expose(); pWindow->wait_for_expose();
} }
int is_a_move = (X != x() || Y != y()); int is_a_move = (X != x() || Y != y());
int oldX = x(), oldY = y(), oldW = w(), oldH = h();
bool true_rescale = Fl_Window::is_a_rescale(); bool true_rescale = Fl_Window::is_a_rescale();
float f = Fl::screen_scale(pWindow->screen_num()); float f = Fl::screen_scale(pWindow->screen_num());
if (fl_win && fl_win->buffer) { if (fl_win && fl_win->buffer) {
@@ -1801,9 +1801,14 @@ void Fl_Wayland_Window_Driver::resize(int X, int Y, int W, int H) {
int is_a_resize = (W != w() || H != h() || true_rescale); int is_a_resize = (W != w() || H != h() || true_rescale);
if (is_a_move) force_position(1); if (is_a_move) force_position(1);
else if (!is_a_resize && !is_a_move) return; else if (!is_a_resize && !is_a_move) return;
depth++;
if (shown() && !(parent() || popup_window())) { if (shown() && !(parent() || popup_window())) {
X = Y = 0; X = Y = 0;
} }
struct wld_window *parent_xid = parent() ? fl_wl_xid(pWindow->window()) : NULL;
// This condition excludes moving or resizing a subwindow while not changing its parent
// and delays application of new X,Y,W,H values if the parent is being committed.
if (!parent_xid || depth > 1 || !parent_xid->frame_cb) {
if (is_a_resize) { if (is_a_resize) {
if (pWindow->parent()) { if (pWindow->parent()) {
if (W < 1) W = 1; if (W < 1) W = 1;
@@ -1816,6 +1821,7 @@ void Fl_Wayland_Window_Driver::resize(int X, int Y, int W, int H) {
x(X); y(Y); x(X); y(Y);
//fprintf(stderr, "move win=%p to %dx%d\n", pWindow, X, Y); //fprintf(stderr, "move win=%p to %dx%d\n", pWindow, X, Y);
} }
}
if (shown()) { if (shown()) {
if (is_a_resize) { if (is_a_resize) {
@@ -1872,20 +1878,19 @@ void Fl_Wayland_Window_Driver::resize(int X, int Y, int W, int H) {
} }
} }
if (fl_win && fl_win->kind == SUBWINDOW && fl_win->subsurface) { if (fl_win && parent_xid) {
// Interactive move or resize of a subwindow requires to commit the parent surface (#987) if (depth == 1) {
struct wld_window *xid = fl_wl_xid(pWindow->window()); // Interactive move or resize of a subwindow requires to commit the parent surface
if (xid) { // and requires to make sure the parent surface is ready to accept a new commit (#987).
if (!xid->frame_cb) { if (!parent_xid->frame_cb) {
xid->frame_cb = wl_surface_frame(xid->wl_surface); parent_xid->frame_cb = wl_surface_frame(parent_xid->wl_surface);
wl_callback_add_listener(xid->frame_cb, Fl_Wayland_Graphics_Driver::p_surface_frame_listener, xid); wl_callback_add_listener(parent_xid->frame_cb, Fl_Wayland_Graphics_Driver::p_surface_frame_listener, parent_xid);
wl_surface_commit(xid->wl_surface); wl_surface_commit(parent_xid->wl_surface);
} else {
pWindow->Fl_Widget::resize(oldX, oldY, oldW, oldH);
} }
} }
checkSubwindowFrame(); // make sure subwindow doesn't leak outside parent checkSubwindowFrame(); // make sure subwindow doesn't leak outside parent
} }
depth--;
} }