diff options
| -rw-r--r-- | src/draw.zig | 4 | ||||
| -rw-r--r-- | src/gui/gui.zig | 1 | ||||
| -rw-r--r-- | src/pardes.zig | 2 | ||||
| -rw-r--r-- | src/views.zig | 2 | ||||
| -rw-r--r-- | test/gui-goldens.txt | 2 | ||||
| -rw-r--r-- | test/perf-baseline-tui-debug.json (renamed from test/perf-baseline-tty-debug.json) | 0 | ||||
| -rw-r--r-- | test/perf-baseline-tui-fast.json (renamed from test/perf-baseline-tty-fast.json) | 0 | ||||
| -rw-r--r-- | test/snapshots/topbarexec.golden | 6 | ||||
| -rw-r--r-- | test/snapshots/windowops.golden | 12 |
9 files changed, 14 insertions, 15 deletions
diff --git a/src/draw.zig b/src/draw.zig index b2884641..83f93be0 100644 --- a/src/draw.zig +++ b/src/draw.zig @@ -703,8 +703,8 @@ pub fn render(p: *Pardes, arena: std.mem.Allocator) !*Surface { const timings = if (virtual) "frame virtual clock\n" else p.frames.summary(&frames_buf); const text = std.fmt.bufPrint( &ov_buf, - "pardes resizes={d}\ntheme {s}\nfont {s}\nterms {d} cols {d}\nactive #{d} {d}x{d}\nscroll {d}/{d}\npinch {d:6.4}\ntscroll {d:7.4}\n{s}", - .{ p.resize_count, p.theme().name, font_name[0..@min(font_name.len, 64)], nlive, p.ncol, p.active, at.cols, at.rows, sb_off, sb_total, p.ov_pinch_scale, p.ov_touch_scroll_delta, timings }, + "pardes resizes={d}\ntheme {s}\nfont {s}\nterms {d} cols {d}\nactive #{d} {d}x{d}\nscroll {d}/{d}\n{s}", + .{ p.resize_count, p.theme().name, font_name[0..@min(font_name.len, 64)], nlive, p.ncol, p.active, at.cols, at.rows, sb_off, sb_total, timings }, ) catch ""; // wide enough for the longest theme name compiled in, which is the // only row here whose width is not ours to choose diff --git a/src/gui/gui.zig b/src/gui/gui.zig index 9b9a08d1..a5b7f34a 100644 --- a/src/gui/gui.zig +++ b/src/gui/gui.zig @@ -2166,6 +2166,7 @@ fn localSession( nc.windowed = true; core.deinit(); core = nc; + frame_probe = &nc.frames; // the old core's ring went with it g.hit_core = nc; shell.core = nc; shell.surface = null; diff --git a/src/pardes.zig b/src/pardes.zig index c75d1f4e..f2d9bef6 100644 --- a/src/pardes.zig +++ b/src/pardes.zig @@ -3971,8 +3971,6 @@ pub const Pardes = struct { /// The focused header's first line on screen, which follows its caret /// when it has more lines than rows. header_top: usize = 0, - ov_pinch_scale: f32 = 1.0, - ov_touch_scroll_delta: f32 = 0.0, /// middle+left chord argument: a kept left selection captured by a left /// press during an active middle select-drag; consumed on middle release chord_arg: ?[]u8 = null, diff --git a/src/views.zig b/src/views.zig index 337b5a23..d7e6703b 100644 --- a/src/views.zig +++ b/src/views.zig @@ -47,7 +47,7 @@ pub const fields = [_][:0]const u8{ "ctrl_w_pending", "register", "leader_on", "window_pick", "leader_keys", "leader_n", "header_focus", "header_column", "header_drag", "header_sweep", "header_scroll", "header_top", - "ov_pinch_scale", "ov_touch_scroll_delta", "chord_arg", "clip_pending", + "chord_arg", "clip_pending", }; /// A pane's fields that are each view's own: where it is in the view's diff --git a/test/gui-goldens.txt b/test/gui-goldens.txt index aef75582..271b2a0f 100644 --- a/test/gui-goldens.txt +++ b/test/gui-goldens.txt @@ -12,6 +12,6 @@ 13-image f5913611e7227eb16733ca778a53621bb49f92489a956c7f8788a7d1a834e153 14-theme-ink 80b0623442b5a4e22f508355351ca4a31b43d9bfd7e7fb63bc054c5274c98e6d 15-theme-acme-light 6e2ba713570d3d2baeaf927218d21f497a43b1d1fc59e7a3eff68f213e5cf7f7 -16-debug 86f8892f2eb9c4f14858d39eb070c95b83905874f33b8f2fa89bbffbad8602d1 +16-debug 776b774f85219e9ced28168e0b90ef4473a8687d1cf14747d21b129dd5aaea98 17-terminal 5f192b2fff53c66d154f4ad310d07c168838172d85cc59ba0fd51720d6abba2e 18-mid-transition 9cfac7223c513df1e15177a69808a0a922e9e6b7fe29c9934754a7e561144d0c diff --git a/test/perf-baseline-tty-debug.json b/test/perf-baseline-tui-debug.json index 15e08111..15e08111 100644 --- a/test/perf-baseline-tty-debug.json +++ b/test/perf-baseline-tui-debug.json diff --git a/test/perf-baseline-tty-fast.json b/test/perf-baseline-tui-fast.json index 8932a150..8932a150 100644 --- a/test/perf-baseline-tty-fast.json +++ b/test/perf-baseline-tui-fast.json diff --git a/test/snapshots/topbarexec.golden b/test/snapshots/topbarexec.golden index 555e924f..b4235a70 100644 --- a/test/snapshots/topbarexec.golden +++ b/test/snapshots/topbarexec.golden @@ -23,9 +23,9 @@ |5: zmarkfile.txt zmark│terms 3 cols 2 │ |6: │active #0 43x8 │ |7: │scroll 0/8 │ -|8: │pinch 1.0000 │ -|9: │tscroll 0.0000 │ -|10: │frame virtual clock │ +|8: │frame virtual clock │ +|9: │ │ +|10: │ │ |11: │ │ |12: /tmp/pardes-snap/topbarexec/cwd Term+bash S │ │ |13: ave Mode Filter Collapse Del ╰────────────────────────────────────╯ diff --git a/test/snapshots/windowops.golden b/test/snapshots/windowops.golden index 37435f91..6124dc43 100644 --- a/test/snapshots/windowops.golden +++ b/test/snapshots/windowops.golden @@ -108,9 +108,9 @@ |5: w.txt w.txt │terms 4 cols 2 │ |6: │active #2 58x27 │ |7: │scroll 0/27 │ -|8: │pinch 1.0000 │ -|9: │tscroll 0.0000 │ -|10: │frame virtual clock │ +|8: │frame virtual clock │ +|9: │ │ +|10: │ │ |11: │ │ |12: │ │ |13: /tmp/pardes-snap/windowops/cwd Term+ba ╰────────────────────────────────────╯ @@ -123,9 +123,9 @@ |5: 0-0 d,#608269, 1-1 d,#0d1410, 2-39 #e5eee5,#0d1410, 40-40 #e5eee5,#608269, 41-61 #e5eee5,#0d1410, 62-62 d,d, 63-77 #b2c3b8,d, 78-98 #b2c3b8,#152019, 99-99 d,d, |6: 0-0 d,#608269, 1-39 d,#0d1410, 40-40 d,#608269, 41-61 d,#0d1410, 62-62 d,d, 63-78 #b2c3b8,d, 79-98 #b2c3b8,#152019, 99-99 d,d, |7: 0-0 d,#608269, 1-39 d,#0d1410, 40-40 d,#608269, 41-61 d,#0d1410, 62-62 d,d, 63-73 #b2c3b8,d, 74-98 #b2c3b8,#152019, 99-99 d,d, -|8: 0-0 d,#608269, 1-39 d,#0d1410, 40-40 d,#608269, 41-61 d,#0d1410, 62-62 d,d, 63-75 #b2c3b8,d, 76-98 #b2c3b8,#152019, 99-99 d,d, -|9: 0-0 d,#608269, 1-39 d,#0d1410, 40-40 d,#608269, 41-61 d,#0d1410, 62-62 d,d, 63-77 #b2c3b8,d, 78-98 #b2c3b8,#152019, 99-99 d,d, -|10: 0-0 d,#608269, 1-39 d,#0d1410, 40-40 d,#608269, 41-61 d,#0d1410, 62-62 d,d, 63-82 #b2c3b8,d, 83-98 #b2c3b8,#152019, 99-99 d,d, +|8: 0-0 d,#608269, 1-39 d,#0d1410, 40-40 d,#608269, 41-61 d,#0d1410, 62-62 d,d, 63-82 #b2c3b8,d, 83-98 #b2c3b8,#152019, 99-99 d,d, +|9: 0-0 d,#608269, 1-39 d,#0d1410, 40-40 d,#608269, 41-61 d,#0d1410, 62-62 d,d, 63-98 d,#152019, 99-99 d,d, +|10: 0-0 d,#608269, 1-39 d,#0d1410, 40-40 d,#608269, 41-61 d,#0d1410, 62-62 d,d, 63-98 d,#152019, 99-99 d,d, |11: 0-0 d,#608269, 1-39 d,#0d1410, 40-40 d,#608269, 41-61 d,#0d1410, 62-62 d,d, 63-98 d,#152019, 99-99 d,d, |12: 0-0 d,#608269, 1-39 d,#0d1410, 40-40 d,#608269, 41-61 d,#0d1410, 62-62 d,d, 63-98 d,#152019, 99-99 d,d, |13: 0-1 d,#496656, 2-32 #b2c3b8,#1d2824, 33-39 #d3b0d9,#1d2824, 40-40 #d3b0d9,#608269, 41-61 #d3b0d9,#0d1410, 62-99 d,d, |
