diff --git a/backend/src/platform/win32_titlebar.zig b/backend/src/platform/win32_titlebar.zig index 408336540..dca4597ca 100644 --- a/backend/src/platform/win32_titlebar.zig +++ b/backend/src/platform/win32_titlebar.zig @@ -554,11 +554,11 @@ pub fn viewportCarryChrome(hwnd: *anyopaque) void { const dwm = win32.graphics.dwm; const wm = win32.ui.windows_and_messaging; const corner: u32 = DWMWCP_DONOTROUND; - _ = dwm.DwmSetWindowAttribute(h, @enumFromInt(DWMWA_WINDOW_CORNER_PREFERENCE), &corner, @sizeOf(u32)); + _ = dwm.DwmSetWindowAttribute(h, @fromBackingInt(@intCast(DWMWA_WINDOW_CORNER_PREFERENCE)), &corner, @sizeOf(u32)); const none: u32 = dwm.DWMWA_COLOR_NONE; _ = dwm.DwmSetWindowAttribute(h, dwm.DWMWA_BORDER_COLOR, &none, @sizeOf(u32)); const no_transitions: u32 = 1; - _ = dwm.DwmSetWindowAttribute(h, @enumFromInt(DWMWA_TRANSITIONS_FORCEDISABLED), &no_transitions, @sizeOf(u32)); + _ = dwm.DwmSetWindowAttribute(h, @fromBackingInt(@intCast(DWMWA_TRANSITIONS_FORCEDISABLED)), &no_transitions, @sizeOf(u32)); _ = win32.ui.shell.SetWindowSubclass(h, carrySubclassProc, carry_subclass_id, 0); const style = wm.GetWindowLongPtrW(h, wm.GWL_STYLE); _ = wm.SetWindowLongPtrW(h, wm.GWL_STYLE, style & ~carry_ws_frame); @@ -595,7 +595,7 @@ fn carrySubclassProc( if (uMsg == WM_NCHITTEST) return HTTRANSPARENT; if (uMsg == wm.WM_MOUSEACTIVATE) return MA_NOACTIVATE; // SDL sets the window's style again as it likes: never a frame. - if (uMsg == wm.WM_STYLECHANGING and @as(isize, @bitCast(wParam)) == @intFromEnum(wm.GWL_STYLE)) { + if (uMsg == wm.WM_STYLECHANGING and @as(isize, @bitCast(wParam)) == @backingInt(wm.GWL_STYLE)) { const ss: *wm.STYLESTRUCT = @ptrFromInt(@as(usize, @bitCast(lParam))); ss.styleNew &= ~@as(u32, @intCast(carry_ws_frame)); } diff --git a/scripts/check-examples.sh b/scripts/check-examples.sh index a90d487f5..7de5b8c66 100755 --- a/scripts/check-examples.sh +++ b/scripts/check-examples.sh @@ -50,9 +50,14 @@ for repo in example-app example-plugin; do mkdir -p "$work/$repo" pack "$EXAMPLES_DIR/$repo" | tar -x -C "$work/$repo" else - # ZIG017: the examples' zig-0.17 branches until their 0.17 PRs land (just after fizzy's - # switch to 0.17), then `main` again in a PR of its own. - git clone --quiet --depth 1 --branch "${EXAMPLES_REF:-zig-0.17}" "https://github.com/fizzyedit/$repo" "$work/$repo" + # ZIG017: each example's zig-0.17 branch while it has one, `main` once its 0.17 PR has landed + # and the branch is gone (example-plugin's did first, and the clone of a branch no longer + # there failed every fizzy pull request). When both have landed, `main` alone, in a PR of + # its own. + url="https://github.com/fizzyedit/$repo" + ref="${EXAMPLES_REF:-zig-0.17}" + if ! git ls-remote --exit-code --heads "$url" "$ref" >/dev/null; then ref=main; fi + git clone --quiet --depth 1 --branch "$ref" "$url" "$work/$repo" fi done