From ede51caa10b017558644cad40d2be08361c8dc9b Mon Sep 17 00:00:00 2001 From: BREW <81044362+b-re-w@users.noreply.github.com> Date: Fri, 13 Nov 2026 13:32:02 +0900 Subject: [PATCH 1/2] Chore: Move the window pin to fcb96ea (#563, #18) Fork #209 (macOS window types each key once), #205 (X11 windows scale with Xft.dpi), #206 (Windows: no stretched present on a failed ResizeBuffers), #204 (CI only). --- renderer/scripts/build-compose.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/renderer/scripts/build-compose.sh b/renderer/scripts/build-compose.sh index 479f33b4e..77925c084 100755 --- a/renderer/scripts/build-compose.sh +++ b/renderer/scripts/build-compose.sh @@ -60,7 +60,11 @@ REVISION="2eb80c12e7615ef80c7661ea63e0f20651f20a31" # appearance setter `dxc_native_set_appearance` (fork #203) and the Windows caption buttons with # Snap Layouts (fork #202, a header `win32_caption.h` beside `win32_window.c`). The Kotlin/Native # Windows window configures its system chrome itself, so its windows keep their caption. -WINDOW_REVISION="b88429d011d24d45f95cac2125fd662b87a97534" +# It also holds the macOS window typing a key once instead of twice (fork #209), the X11 +# windows reporting Xft.dpi as their scale and following its changes (fork #205), and the +# Windows window skipping a stretched present when ResizeBuffers fails (fork #206, a header +# `win32_resize.h` beside `win32_window.c`). +WINDOW_REVISION="fcb96eaf42b7e63746c5eca1b3b27033797bfbcf" # The commit the Windows build takes. It was its own pin while the Windows Compose lived on a # branch apart from the Compose pin; the fork's `extended` now holds mingwX64 for every Compose UI # module, the skiko build for mingwX64 (extended/skiko/build-skiko-mingw.sh, which also compiles From 8ac0918f4cf1783e30fc8b288c9f22155d53b1a4 Mon Sep 17 00:00:00 2001 From: BREW <81044362+b-re-w@users.noreply.github.com> Date: Fri, 13 Nov 2026 14:07:27 +0900 Subject: [PATCH 2/2] Chore: Move the window pin to 7c7a907 (#563, #18) fcb96ea never had its own fork CI run (superseded by #207), so the pin goes to 7c7a907: fork #209 (macOS types each key once), #205 and #210 (Linux scale from Xft.dpi, GNOME text scale once), #206 (no stretched present on Windows), #207 (native view slot; both macOS windows follow a backing-scale change). linux-native-window.test.sh now expects the configure event to measure at the window's scale, which #205 reads from Xft.dpi instead of a constant. --- renderer/scripts/build-compose.sh | 5 +++-- scripts/tests/linux-native-window.test.sh | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/renderer/scripts/build-compose.sh b/renderer/scripts/build-compose.sh index 77925c084..8465e0dfe 100755 --- a/renderer/scripts/build-compose.sh +++ b/renderer/scripts/build-compose.sh @@ -63,8 +63,9 @@ REVISION="2eb80c12e7615ef80c7661ea63e0f20651f20a31" # It also holds the macOS window typing a key once instead of twice (fork #209), the X11 # windows reporting Xft.dpi as their scale and following its changes (fork #205), and the # Windows window skipping a stretched present when ResizeBuffers fails (fork #206, a header -# `win32_resize.h` beside `win32_window.c`). -WINDOW_REVISION="fcb96eaf42b7e63746c5eca1b3b27033797bfbcf" +# `win32_resize.h` beside `win32_window.c`), the native view slot and both macOS windows following +# a backing-scale change (fork #207), and the GNOME text scale applied once on Linux (fork #210). +WINDOW_REVISION="7c7a907631c630cd71ff3ffeb81d360f13a28bc8" # The commit the Windows build takes. It was its own pin while the Windows Compose lived on a # branch apart from the Compose pin; the fork's `extended` now holds mingwX64 for every Compose UI # module, the skiko build for mingwX64 (extended/skiko/build-skiko-mingw.sh, which also compiles diff --git a/scripts/tests/linux-native-window.test.sh b/scripts/tests/linux-native-window.test.sh index 319c938e6..923b89b93 100755 --- a/scripts/tests/linux-native-window.test.sh +++ b/scripts/tests/linux-native-window.test.sh @@ -219,7 +219,8 @@ configure="$(sed -n '/ConfigureNotify -> {/,/^ Expose ->/p' "$window" # event and expects the frame drawn before the call returns; the renderer's window draws it. grep -Fq 'resized()' <<< "$configure" || fail "the window records a new size without asking for the frame for it, so the edge moves before the content does" -grep -Fq 'measured = WindowMeasurement(width, height, DENSITY)' <<< "$configure" || +# The scale is the display's (Xft.dpi), not a constant, since the window follows HiDPI. +grep -Fq 'measured = WindowMeasurement(width, height, scale)' <<< "$configure" || fail "the window no longer takes the new size from the configure event" resize_branch="$(sed -n '/override fun onEvent(event: WindowEvent) {/,/^ }/p' "$host_window")" grep -Fq 'WindowEvent.RESIZE' <<< "$resize_branch" && grep -Fq 'frames.draw()' <<< "$resize_branch" ||