tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Merge branch 'blender-v4.1-release'

This commit is contained in:
Campbell Barton 2024-03-12 17:04:59 +11:00
parent 5fd64db1cf 353ec1090a
commit 8c276cb073
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/ghost/intern/GHOST_SystemWayland.cc
View File

@ -8114,8 +8114,10 @@ void GHOST_SystemWayland::setMultitouchGestures(const bool use)
}
m_multitouchGestures = use;
#ifdef USE_EVENT_BACKGROUND_THREAD
/* Ensure this listeners aren't removed while events are generated. */
std::lock_guard lock_server_guard{*server_mutex};
#endif
for (GWL_Seat *seat : display_->seats) {
if (use == gwl_seat_capability_pointer_multitouch_check(seat, use)) {
continue;

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

@ -1374,16 +1374,18 @@ static void libdecor_frame_handle_configure(libdecor_frame *frame,
decor.pending.configuration = configuration;
decor.pending.ack_configure = true;
# ifdef USE_EVENT_BACKGROUND_THREAD
if (!is_main_thread) {
# ifdef USE_LIBDECOR_CONFIG_COPY_WORKAROUND
# ifdef USE_LIBDECOR_CONFIG_COPY_WORKAROUND
decor.pending.configuration = ghost_wl_libdecor_configuration_copy(configuration);
decor.pending.configuration_needs_free = true;
# else
# else
/* Without a way to copy the configuration,
* the configuration will be ignored as it can't be postponed. */
decor.pending.configuration = nullptr;
# endif /* !USE_LIBDECOR_CONFIG_COPY_WORKAROUND */
# endif /* !USE_LIBDECOR_CONFIG_COPY_WORKAROUND */
}
# endif
# ifdef USE_LIBDECOR_CONFIG_COPY_QUEUE
if (!(size_next[0] && size_next[1])) {