summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/draw.zig4
-rw-r--r--src/gui/gui.zig1
-rw-r--r--src/pardes.zig2
-rw-r--r--src/views.zig2
4 files changed, 4 insertions, 5 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