diff --git a/build.zig.zon b/build.zig.zon index c0ed749..e126f18 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -33,8 +33,8 @@ // internet connectivity. .dependencies = .{ .dvui = .{ - .url = "https://github.com/david-vanderson/dvui/archive/main.tar.gz", - .hash = "dvui-0.4.0-dev-AQFJmev72QC6e0ojhnW8a_wRhZDgzWWLgeyoNuIPZc2m", + .url = "git+https://github.com/david-vanderson/dvui#edb2d5a4cd2981fca74ee5f096277b91333c1316", + .hash = "dvui-0.4.0-dev-AQFJmeGB3QAwun9qF76CDE5IopA4nUVRgD-IwwTsOo4H", }, // See `zig fetch --save ` for a command-line interface for adding dependencies. diff --git a/review.txt b/review.txt new file mode 100644 index 0000000..e69de29 diff --git a/src/render/CpuRenderEngine.zig b/src/render/CpuRenderEngine.zig index 6ec4187..c6e0451 100644 --- a/src/render/CpuRenderEngine.zig +++ b/src/render/CpuRenderEngine.zig @@ -172,7 +172,7 @@ pub fn example(self: CpuRenderEngine, canvas_size: Size_i, visible_rect: Rect_i) .Squares => self.renderSquares(pixels, canvas_size, visible_rect), } - return try dvui.textureCreate(pixels, width, height, .nearest); + return try dvui.textureCreate(pixels, width, height, .nearest, .rgba_8_8_8_8); } pub fn renderEngine(self: *CpuRenderEngine) RenderEngine { @@ -191,7 +191,7 @@ pub fn renderDocument(self: *CpuRenderEngine, document: *const Document, canvas_ try cpu_draw.drawDocument(pixels, width, height, visible_rect, document, canvas_size, self._allocator); self._renderStats.render_time_ns = t.read(); - return try dvui.textureCreate(pixels, width, height, .nearest); + return try dvui.textureCreate(pixels, width, height, .nearest, .rgba_8_8_8_8); } pub fn getStats(self: CpuRenderEngine) RenderStats { diff --git a/src/ui/canvas_view.zig b/src/ui/canvas_view.zig index aff748c..e44ec83 100644 --- a/src/ui/canvas_view.zig +++ b/src/ui/canvas_view.zig @@ -17,14 +17,15 @@ pub fn canvasView(canvas: *Canvas, selected_object_id: ?u64, content_rect_scale: var overlay = dvui.overlay(@src(), .{ .expand = .both }); { const overlay_parent = dvui.parentGet(); + const init_options: dvui.ScrollAreaWidget.InitOpts = .{ + .scroll_info = &canvas.scroll, + .vertical_bar = .auto, + .horizontal_bar = .auto, + .process_events_after = false, + }; var scroll = dvui.scrollArea( @src(), - .{ - .scroll_info = &canvas.scroll, - .vertical_bar = .auto, - .horizontal_bar = .auto, - .process_events_after = false, - }, + init_options, .{ .expand = .both, .background = false, @@ -100,7 +101,7 @@ pub fn canvasView(canvas: *Canvas, selected_object_id: ?u64, content_rect_scale: } } - if (!scroll.init_opts.process_events_after) { + if (!init_options.process_events_after) { if (scroll.scroll) |*sc| { dvui.clipSet(sc.prevClip); sc.processEventsAfter(); diff --git a/src/ui/left_panel.zig b/src/ui/left_panel.zig index 67370ee..d036ba0 100644 --- a/src/ui/left_panel.zig +++ b/src/ui/left_panel.zig @@ -222,11 +222,13 @@ pub fn leftPanel(ctx: *WindowContext) void { }, ); { - dvui.label(@src(), "Objects", .{}, .{ .font = .{ - .id = dvui.themeGet().font_heading.id, - .line_height_factor = dvui.themeGet().font_heading.line_height_factor, - .size = dvui.themeGet().font_heading.size + 8, - }, .gravity_x = 0.5 }); + dvui.label(@src(), "Objects", .{}, .{ + .font = .{ + .line_height_factor = dvui.themeGet().font_heading.line_height_factor, + .size = dvui.themeGet().font_heading.size + 8, + }, + .gravity_x = 0.5, + }); var scroll = dvui.scrollArea( @src(), .{ .vertical = .auto, .horizontal = .auto },