fix: compilation issues with win32 (win32.ScrollView)

capy-ui · Dec 31, 2024 · 1a4f820 · 1a4f820
1 parent d97e1ad
commit 1a4f820
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -18,6 +18,7 @@ jobs:
         uses: goto-bus-stop/setup-zig@v2
         with:
           version: 0.14.0-dev.2577+271452d22
+
       - name: Test Coverage Capy for native
         run: xvfb-run -a zig build coverage
         env:

diff --git a/src/backends/win32/backend.zig b/src/backends/win32/backend.zig
@@ -1526,10 +1526,10 @@ pub const ScrollView = struct {
         const child = win32.GetWindow(hwnd, win32.GW_CHILD);
         _ = win32.MoveWindow(
             child,
-            @max(rect.left - parent.left, @min(0, -(@as(c_int, @intCast(preferred.width)) - width))),
-            @max(rect.top - parent.top, @min(0, -(@as(c_int, @intCast(preferred.height)) - height))),
-            @as(c_int, @intCast(preferred.width)),
-            @as(c_int, @intCast(preferred.height)),
+            @max(rect.left - parent.left, @min(0, -(@as(c_int, @intFromFloat(preferred.width)) - width))),
+            @max(rect.top - parent.top, @min(0, -(@as(c_int, @intFromFloat(preferred.height)) - height))),
+            @as(c_int, @intFromFloat(preferred.width)),
+            @as(c_int, @intFromFloat(preferred.height)),
             1,
         );
 
@@ -1538,7 +1538,7 @@ pub const ScrollView = struct {
             .cbSize = @sizeOf(win32.SCROLLINFO),
             .fMask = @as(win32.SCROLLINFO_MASK, @enumFromInt(@intFromEnum(win32.SIF_RANGE) | @intFromEnum(win32.SIF_PAGE))),
             .nMin = 0,
-            .nMax = @as(c_int, @intCast(preferred.width)),
+            .nMax = @as(c_int, @intFromFloat(preferred.width)),
             .nPage = @as(c_uint, @intCast(width)),
             .nPos = 0,
             .nTrackPos = 0,
@@ -1549,7 +1549,7 @@ pub const ScrollView = struct {
             .cbSize = @sizeOf(win32.SCROLLINFO),
             .fMask = @as(win32.SCROLLINFO_MASK, @enumFromInt(@intFromEnum(win32.SIF_RANGE) | @intFromEnum(win32.SIF_PAGE))),
             .nMin = 0,
-            .nMax = @as(c_int, @intCast(preferred.height)),
+            .nMax = @as(c_int, @intFromFloat(preferred.height)),
             .nPage = @as(c_uint, @intCast(height)),
             .nPos = 0,
             .nTrackPos = 0,