diff --git a/build.zig.zon b/build.zig.zon index fb94b4dac..9227ba8a0 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -78,8 +78,8 @@ }, .zgui = .{ - .url = "https://github.com/zig-gamedev/zgui/archive/ec1372b6ca7ca0cfd187fc93c5d64878271ba608.tar.gz", - .hash = "zgui-0.6.0-dev--L6sZIWbaADnz0Nsywh4rzg-H2ZqWn6m_1mNWjaKLlBQ", + .url = "https://github.com/zig-gamedev/zgui/archive/920f489c5b822588eb9309a46e910cfb3f95f405.tar.gz", + .hash = "zgui-0.6.0-dev--L6sZH-maACBEWPkZHpd7BBQJSVKxzhv7P9Vu7c5lzFw", }, .zjobs = .{ diff --git a/libs/zgui b/libs/zgui index ec1372b6c..920f489c5 160000 --- a/libs/zgui +++ b/libs/zgui @@ -1 +1 @@ -Subproject commit ec1372b6ca7ca0cfd187fc93c5d64878271ba608 +Subproject commit 920f489c5b822588eb9309a46e910cfb3f95f405 diff --git a/samples/triangle_wgpu/src/triangle_wgpu.zig b/samples/triangle_wgpu/src/triangle_wgpu.zig index 4b2bd96aa..f2ecf2b70 100644 --- a/samples/triangle_wgpu/src/triangle_wgpu.zig +++ b/samples/triangle_wgpu/src/triangle_wgpu.zig @@ -172,10 +172,8 @@ fn deinit(allocator: std.mem.Allocator, demo: *DemoState) void { } fn update(demo: *DemoState) void { - zgui.backend.newFrame( - demo.gctx.swapchain_descriptor.width, - demo.gctx.swapchain_descriptor.height, - ); + _ = demo; + zgui.backend.newFrame(); zgui.showDemoWindow(null); } @@ -345,15 +343,10 @@ pub fn main() !void { var demo = try init(allocator, window); defer deinit(allocator, &demo); - const scale_factor = scale_factor: { - const scale = window.getContentScale(); - break :scale_factor @max(scale[0], scale[1]); - }; - zgui.init(allocator); defer zgui.deinit(); - _ = zgui.io.addFontFromFile(content_dir ++ "Roboto-Medium.ttf", math.floor(16.0 * scale_factor)); + _ = zgui.io.addFontFromFile(content_dir ++ "Roboto-Medium.ttf", math.floor(16.0)); zgui.backend.init( window, @@ -363,10 +356,8 @@ pub fn main() !void { ); defer zgui.backend.deinit(); - zgui.getStyle().scaleAllSizes(scale_factor); - while (!window.shouldClose() and window.getKey(.escape) != .press) { - zglfw.pollEvents(); + zglfw.pollEvents(); update(&demo); draw(&demo); }