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

Merge branch 'blender-v5.0-release'

Browse Source
This commit is contained in:
Sean Kim
2025-10-15 19:32:24 -07:00
parent 8baf294b0d e059c75ef5
commit 59746fde64
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1034,7 +1034,31 @@ static void gwl_window_frame_update_from_pending_no_lock(GWL_Window *win)
if (decor.initial_configure_seen == false) {
decor.initial_configure_seen = true;
if (decor.initial_configure_state) {
gwl_libdecor_window_initial_configure_state_set(&decor, gwl_window_state_get(win));
const GHOST_TWindowState state_current = gwl_window_state_get(win);
const GHOST_TWindowState state = decor.initial_configure_state.value();
gwl_libdecor_window_initial_configure_state_set(&decor, state_current);
/* An unfortunate hack for GNOME-48 and older.
* It's necessary to force the window to refresh,
* otherwise the window cannot be interacted with, see: #148142.
*
* Since there doesn't seem to a be a way to request an
* update directly: reset the title to force an update.
*
* Note that temporarily maximizing the window also works
* but this is more likely to flicker on startup.
*
* Interestingly the other call to #gwl_libdecor_window_initial_configure_state_set
* would also suffer from this problem with GNOME-49 but in that case
* committing the surface resolves the problem. */
if (((state == state_current) && (state == GHOST_kWindowStateNormal))) {
/* Ensure the title changes. */
const std::string &title = win->title;
const char *title_swap = " ";
libdecor_frame_set_title(decor.frame, title_swap + (title.empty() ? 0 : 1));
libdecor_frame_set_title(decor.frame, title.c_str());
}
}
}

4
tests/python/ui_simulate/test_undo.py
View File

@@ -17,9 +17,9 @@ _MENU_CONFIRM_HACK = True
# the corresponding tests to run as expected. See: #136012.
_MENU_CONFIRM_HACK_MULTI_WINDOW_PAUSE_SECONDS = 1 / 60
# WARNING: macOS requires extra delay (it's unclear why), see: #146143.
# WARNING: macOS and windows require an extra delay (it's unclear why), see: #146143.
import sys
if sys.platform == "darwin":
if sys.platform in {"darwin", "win32"}:
_MENU_CONFIRM_HACK_MULTI_WINDOW_PAUSE_SECONDS = 1 / 6
del sys