Update to latest dvui.
This commit is contained in:
@@ -33,8 +33,8 @@
|
|||||||
// internet connectivity.
|
// internet connectivity.
|
||||||
.dependencies = .{
|
.dependencies = .{
|
||||||
.dvui = .{
|
.dvui = .{
|
||||||
.url = "https://github.com/david-vanderson/dvui/archive/main.tar.gz",
|
.url = "git+https://github.com/david-vanderson/dvui#edb2d5a4cd2981fca74ee5f096277b91333c1316",
|
||||||
.hash = "dvui-0.4.0-dev-AQFJmev72QC6e0ojhnW8a_wRhZDgzWWLgeyoNuIPZc2m",
|
.hash = "dvui-0.4.0-dev-AQFJmeGB3QAwun9qF76CDE5IopA4nUVRgD-IwwTsOo4H",
|
||||||
},
|
},
|
||||||
|
|
||||||
// See `zig fetch --save <url>` for a command-line interface for adding dependencies.
|
// See `zig fetch --save <url>` for a command-line interface for adding dependencies.
|
||||||
|
|||||||
0
review.txt
Normal file
0
review.txt
Normal file
@@ -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),
|
.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 {
|
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);
|
try cpu_draw.drawDocument(pixels, width, height, visible_rect, document, canvas_size, self._allocator);
|
||||||
self._renderStats.render_time_ns = t.read();
|
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 {
|
pub fn getStats(self: CpuRenderEngine) RenderStats {
|
||||||
|
|||||||
@@ -17,14 +17,15 @@ pub fn canvasView(canvas: *Canvas, selected_object_id: ?u64, content_rect_scale:
|
|||||||
var overlay = dvui.overlay(@src(), .{ .expand = .both });
|
var overlay = dvui.overlay(@src(), .{ .expand = .both });
|
||||||
{
|
{
|
||||||
const overlay_parent = dvui.parentGet();
|
const overlay_parent = dvui.parentGet();
|
||||||
var scroll = dvui.scrollArea(
|
const init_options: dvui.ScrollAreaWidget.InitOpts = .{
|
||||||
@src(),
|
|
||||||
.{
|
|
||||||
.scroll_info = &canvas.scroll,
|
.scroll_info = &canvas.scroll,
|
||||||
.vertical_bar = .auto,
|
.vertical_bar = .auto,
|
||||||
.horizontal_bar = .auto,
|
.horizontal_bar = .auto,
|
||||||
.process_events_after = false,
|
.process_events_after = false,
|
||||||
},
|
};
|
||||||
|
var scroll = dvui.scrollArea(
|
||||||
|
@src(),
|
||||||
|
init_options,
|
||||||
.{
|
.{
|
||||||
.expand = .both,
|
.expand = .both,
|
||||||
.background = false,
|
.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| {
|
if (scroll.scroll) |*sc| {
|
||||||
dvui.clipSet(sc.prevClip);
|
dvui.clipSet(sc.prevClip);
|
||||||
sc.processEventsAfter();
|
sc.processEventsAfter();
|
||||||
|
|||||||
@@ -222,11 +222,13 @@ pub fn leftPanel(ctx: *WindowContext) void {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
{
|
{
|
||||||
dvui.label(@src(), "Objects", .{}, .{ .font = .{
|
dvui.label(@src(), "Objects", .{}, .{
|
||||||
.id = dvui.themeGet().font_heading.id,
|
.font = .{
|
||||||
.line_height_factor = dvui.themeGet().font_heading.line_height_factor,
|
.line_height_factor = dvui.themeGet().font_heading.line_height_factor,
|
||||||
.size = dvui.themeGet().font_heading.size + 8,
|
.size = dvui.themeGet().font_heading.size + 8,
|
||||||
}, .gravity_x = 0.5 });
|
},
|
||||||
|
.gravity_x = 0.5,
|
||||||
|
});
|
||||||
var scroll = dvui.scrollArea(
|
var scroll = dvui.scrollArea(
|
||||||
@src(),
|
@src(),
|
||||||
.{ .vertical = .auto, .horizontal = .auto },
|
.{ .vertical = .auto, .horizontal = .auto },
|
||||||
|
|||||||
Reference in New Issue
Block a user