griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GHOST/Wayland: postpone mapping LIBDECOR windows

Browse Source 
While there should be no user visible changes.
Follow LIBDECOR sample code by setting the app-id & title before
mapping the window.
This commit is contained in:
Campbell Barton
2024-05-02 10:34:50 +10:00
parent a63e44a61f
commit 0f2827ff77
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
intern/ghost/intern/GHOST_WindowWayland.cc
View File

@@ -1712,7 +1712,6 @@ GHOST_WindowWayland::GHOST_WindowWayland(GHOST_SystemWayland *system,
/* create window decorations */
decor.frame = libdecor_decorate(
system_->libdecor_context_get(), window_->wl.surface, &libdecor_frame_iface, window_);
libdecor_frame_map(window_->libdecor->frame);
libdecor_frame_set_min_content_size(decor.frame, UNPACK2(size_min));
libdecor_frame_set_app_id(decor.frame, xdg_app_id);
@@ -1747,6 +1746,14 @@ GHOST_WindowWayland::GHOST_WindowWayland(GHOST_SystemWayland *system,
gwl_window_title_set(window_, title);
#ifdef WITH_GHOST_WAYLAND_LIBDECOR
if (use_libdecor) {
/* Postpone mapping the window until after the app-id & title have been set.
* While this doesn't seem to be a requirement, LIBDECOR example code does this. */
libdecor_frame_map(window_->libdecor->frame);
}
#endif
wl_surface_set_user_data(window_->wl.surface, this);
/* NOTE: the method used for XDG & LIBDECOR initialization (using `initial_configure_seen`)