Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-25 13:16:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

font(metrics): always apply minimum values after calculating

Browse Source
This commit is contained in:
Qwerasd
2024-12-12 13:47:13 -05:00
parent fb50143cec
commit 0557bf8301
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/font/face/Metrics.zig
View File

@ -156,7 +156,7 @@ pub fn calc(opts: CalcOpts) Metrics {
(opts.strikethrough_position orelse (opts.strikethrough_position orelse
ex_height * 0.5 + strikethrough_thickness * 0.5)); ex_height * 0.5 + strikethrough_thickness * 0.5));
const result: Metrics = .{ var result: Metrics = .{
.cell_width = @intFromFloat(cell_width), .cell_width = @intFromFloat(cell_width),
.cell_height = @intFromFloat(cell_height), .cell_height = @intFromFloat(cell_height),
.cell_baseline = @intFromFloat(cell_baseline), .cell_baseline = @intFromFloat(cell_baseline),
@ -169,6 +169,9 @@ pub fn calc(opts: CalcOpts) Metrics {
.box_thickness = @intFromFloat(underline_thickness), .box_thickness = @intFromFloat(underline_thickness),
}; };
// Ensure all metrics are within their allowable range.
result.clamp();
// std.log.debug("metrics={}", .{result}); // std.log.debug("metrics={}", .{result});
return result; return result;
@ -220,16 +223,25 @@ pub fn apply(self: *Metrics, mods: ModifierSet) void {
}, },
inline else => |tag| { inline else => |tag| {
var new = entry.value_ptr.apply(@field(self, @tagName(tag))); @field(self, @tagName(tag)) = entry.value_ptr.apply(@field(self, @tagName(tag)));
// If we have a minimum acceptable value
// for this metric, clamp the new value.
if (@hasDecl(Minimums, @tagName(tag))) {
new = @max(new, @field(Minimums, @tagName(tag)));
}
@field(self, @tagName(tag)) = new;
}, },
} }
} }
// Prevent modifiers from pushing metrics out of their allowable range.
self.clamp();
}
/// Clamp all metrics to their allowable range.
fn clamp(self: *Metrics) void {
inline for (std.meta.fields(Metrics)) |field| {
if (@hasDecl(Minimums, field.name)) {
@field(self, field.name) = @max(
@field(self, field.name),
@field(Minimums, field.name),
);
}
}
} }
/// A set of modifiers to apply to metrics. We use a hash map because /// A set of modifiers to apply to metrics. We use a hash map because