bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

GHOST/Wayland: only use a single swapBuffers for libdecor redrawing

Browse Source 
Using a single draw works in my tests and I couldn't reproduce the
issue noted in the comment.

Also apply minor cleanup, assigning a variable before calling methods to
reduce diff-noise in planned changes.
This commit is contained in:
Campbell Barton 2022-11-15 12:28:45 +11:00
parent b28348f9e9
commit 56f783d883
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
intern/ghost/intern/GHOST_WindowWayland.cpp
View File

@ -332,7 +332,10 @@ static void xdg_toplevel_handle_configure(void *data,
static void xdg_toplevel_handle_close(void *data, xdg_toplevel * /*xdg_toplevel*/) static void xdg_toplevel_handle_close(void *data, xdg_toplevel * /*xdg_toplevel*/)
{ {
CLOG_INFO(LOG, 2, "close"); CLOG_INFO(LOG, 2, "close");
static_cast<GWL_Window *>(data)->ghost_window->close();
GWL_Window *win = static_cast<GWL_Window *>(data);
win->ghost_window->close();
} }
static const xdg_toplevel_listener xdg_toplevel_listener = { static const xdg_toplevel_listener xdg_toplevel_listener = {
@ -424,16 +427,18 @@ static void frame_handle_close(struct libdecor_frame * /*frame*/, void *data)
{ {
CLOG_INFO(LOG, 2, "close"); CLOG_INFO(LOG, 2, "close");
static_cast<GWL_Window *>(data)->ghost_window->close(); GWL_Window *win = static_cast<GWL_Window *>(data);
win->ghost_window->close();
} }
static void frame_handle_commit(struct libdecor_frame * /*frame*/, void *data) static void frame_handle_commit(struct libdecor_frame * /*frame*/, void *data)
{ {
CLOG_INFO(LOG, 2, "commit"); CLOG_INFO(LOG, 2, "commit");
/* We have to swap twice to keep any pop-up menus alive. */ GWL_Window *win = static_cast<GWL_Window *>(data);
static_cast<GWL_Window *>(data)->ghost_window->swapBuffers();
static_cast<GWL_Window *>(data)->ghost_window->swapBuffers(); win->ghost_window->swapBuffers();
} }
static struct libdecor_frame_interface libdecor_frame_iface = { static struct libdecor_frame_interface libdecor_frame_iface = {
@ -461,7 +466,10 @@ static void xdg_toplevel_decoration_handle_configure(
const uint32_t mode) const uint32_t mode)
{ {
CLOG_INFO(LOG, 2, "configure (mode=%u)", mode); CLOG_INFO(LOG, 2, "configure (mode=%u)", mode);
static_cast<GWL_Window *>(data)->xdg_decor->mode = (zxdg_toplevel_decoration_v1_mode)mode;
GWL_Window *win = static_cast<GWL_Window *>(data);
win->xdg_decor->mode = (zxdg_toplevel_decoration_v1_mode)mode;
} }
static const zxdg_toplevel_decoration_v1_listener xdg_toplevel_decoration_v1_listener = { static const zxdg_toplevel_decoration_v1_listener xdg_toplevel_decoration_v1_listener = {