nullptr/Zivro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Миничистка

Browse Source
This commit is contained in:
Роман Пытков
2025-12-20 21:16:52 +03:00
parent 643aaee926
commit 8f462cc93b
2 changed files with 24 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/main.zig
View File

@@ -140,36 +140,9 @@ fn gui_frame(ctx: *WindowContext) bool {
},
);
{
// Canvas область внутри scroll area (полный размер изображения).
// Важно: мы НЕ двигаем отдельный image-виджет под visible_rect;
// вместо этого рисуем частичную текстуру внутри этой области со сдвигом.
const natural_scale = dvui.windowNaturalScale();
const img_area_divider = if (canvas.native_scaling) 1 else natural_scale;
const natural_scale = if (canvas.native_scaling) 1 else dvui.windowNaturalScale();
const img_size = canvas.getScaledImageSize();
var img_area = dvui.box(
@src(),
.{ .dir = .vertical },
.{
.background = false,
.margin = .{
.x = @as(f32, @floatFromInt(img_size.x)) / img_area_divider,
.y = @as(f32, @floatFromInt(img_size.y)) / img_area_divider,
.w = @as(f32, @floatFromInt(img_size.x)) / img_area_divider,
.h = @as(f32, @floatFromInt(img_size.y)) / img_area_divider,
},
.min_size_content = .{
.w = @as(f32, @floatFromInt(img_size.w)) / img_area_divider,
.h = @as(f32, @floatFromInt(img_size.h)) / img_area_divider,
},
.max_size_content = .{
.w = @as(f32, @floatFromInt(img_size.w)) / img_area_divider,
.h = @as(f32, @floatFromInt(img_size.h)) / img_area_divider,
},
},
);
defer img_area.deinit();
// Получить viewport и scroll offset
const viewport_rect = scroll.data().contentRect();
const scroll_current = dvui.Point{ .x = canvas.scroll.viewport.x, .y = canvas.scroll.viewport.y };
@@ -177,39 +150,40 @@ fn gui_frame(ctx: *WindowContext) bool {
// viewport_rect/scroll_current — в natural единицах.
// Для расчёта видимой области в пикселях изображения переводим в physical.
const viewport_px = dvui.Rect{
.x = viewport_rect.x * img_area_divider,
.y = viewport_rect.y * img_area_divider,
.w = viewport_rect.w * img_area_divider,
.h = viewport_rect.h * img_area_divider,
.x = viewport_rect.x * natural_scale,
.y = viewport_rect.y * natural_scale,
.w = viewport_rect.w * natural_scale,
.h = viewport_rect.h * natural_scale,
};
const scroll_px = dvui.Point{
.x = scroll_current.x * img_area_divider,
.y = scroll_current.y * img_area_divider,
.x = scroll_current.x * natural_scale,
.y = scroll_current.y * natural_scale,
};
canvas.updateVisibleImageRect(viewport_px, scroll_px) catch |err| {
std.debug.print("updateVisibleImageRect error: {}\n", .{err});
};
// if (canvas.visible_rect) |vis| {
// if (vis.w != 0 and vis.h != 0) {
// const area_rs = img_area.data().contentRectScale();
// var part_rs = area_rs;
// part_rs.r = .{
// .x = area_rs.r.x + @as(f32, @floatFromInt(vis.x)),
// .y = area_rs.r.y + @as(f32, @floatFromInt(vis.y)),
// .w = @as(f32, @floatFromInt(vis.w)),
// .h = @as(f32, @floatFromInt(vis.h)),
// };
// canvas.render(part_rs) catch {};
// }
// }
if (canvas.texture) |tex| {
_ = dvui.image(
@src(),
.{ .source = .{ .texture = tex } },
.{
.expand = .both,
.background = false,
.margin = .{
.x = @as(f32, @floatFromInt(img_size.x)) / natural_scale,
.y = @as(f32, @floatFromInt(img_size.y)) / natural_scale,
.w = @as(f32, @floatFromInt(img_size.x)) / natural_scale,
.h = @as(f32, @floatFromInt(img_size.y)) / natural_scale,
},
.min_size_content = .{
.w = @as(f32, @floatFromInt(img_size.w)) / natural_scale,
.h = @as(f32, @floatFromInt(img_size.h)) / natural_scale,
},
.max_size_content = .{
.w = @as(f32, @floatFromInt(img_size.w)) / natural_scale,
.h = @as(f32, @floatFromInt(img_size.h)) / natural_scale,
},
},
);
}
@@ -223,7 +197,6 @@ fn gui_frame(ctx: *WindowContext) bool {
if (dvui.eventMatchSimple(e, scroll.data()) and (action == .wheel_x or action == .wheel_y)) {
switch (action) {
.wheel_y => |y| {
canvas.updateVisibleImageRect(viewport_px, scroll_px) catch {};
canvas.addZoom(y / 1000);
canvas.redrawGradient() catch {};
},