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

font: SharedGridSet DerivedConfig does not take font size

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-04-06 10:45:44 -07:00
parent b9efd83798
commit ebd31ad50f
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/font/SharedGridSet.zig
View File

@ -95,7 +95,7 @@ pub fn ref(
config: *const DerivedConfig, config: *const DerivedConfig,
font_size: DesiredSize, font_size: DesiredSize,
) !struct { Key, *SharedGrid } { ) !struct { Key, *SharedGrid } {
var key = try Key.init(self.alloc, config); var key = try Key.init(self.alloc, config, font_size);
errdefer key.deinit(); errdefer key.deinit();
self.lock.lock(); self.lock.lock();
@ -353,7 +353,6 @@ pub const DerivedConfig = struct {
@"font-style-bold": configpkg.FontStyle, @"font-style-bold": configpkg.FontStyle,
@"font-style-italic": configpkg.FontStyle, @"font-style-italic": configpkg.FontStyle,
@"font-style-bold-italic": configpkg.FontStyle, @"font-style-bold-italic": configpkg.FontStyle,
@"font-size": u8,
@"font-variation": configpkg.RepeatableFontVariation, @"font-variation": configpkg.RepeatableFontVariation,
@"font-variation-bold": configpkg.RepeatableFontVariation, @"font-variation-bold": configpkg.RepeatableFontVariation,
@"font-variation-italic": configpkg.RepeatableFontVariation, @"font-variation-italic": configpkg.RepeatableFontVariation,
@ -382,7 +381,6 @@ pub const DerivedConfig = struct {
.@"font-style-bold" = try config.@"font-style-bold".clone(alloc), .@"font-style-bold" = try config.@"font-style-bold".clone(alloc),
.@"font-style-italic" = try config.@"font-style-italic".clone(alloc), .@"font-style-italic" = try config.@"font-style-italic".clone(alloc),
.@"font-style-bold-italic" = try config.@"font-style-bold-italic".clone(alloc), .@"font-style-bold-italic" = try config.@"font-style-bold-italic".clone(alloc),
.@"font-size" = config.@"font-size",
.@"font-variation" = try config.@"font-variation".clone(alloc), .@"font-variation" = try config.@"font-variation".clone(alloc),
.@"font-variation-bold" = try config.@"font-variation-bold".clone(alloc), .@"font-variation-bold" = try config.@"font-variation-bold".clone(alloc),
.@"font-variation-italic" = try config.@"font-variation-italic".clone(alloc), .@"font-variation-italic" = try config.@"font-variation-italic".clone(alloc),
@ -445,6 +443,7 @@ pub const Key = struct {
pub fn init( pub fn init(
alloc_gpa: Allocator, alloc_gpa: Allocator,
config: *const DerivedConfig, config: *const DerivedConfig,
font_size: DesiredSize,
) !Key { ) !Key {
var arena = ArenaAllocator.init(alloc_gpa); var arena = ArenaAllocator.init(alloc_gpa);
errdefer arena.deinit(); errdefer arena.deinit();
@ -456,7 +455,7 @@ pub const Key = struct {
try descriptors.append(.{ try descriptors.append(.{
.family = family, .family = family,
.style = config.@"font-style".nameValue(), .style = config.@"font-style".nameValue(),
.size = config.@"font-size", .size = font_size.points,
.variations = config.@"font-variation".list.items, .variations = config.@"font-variation".list.items,
}); });
} }
@ -474,7 +473,7 @@ pub const Key = struct {
try descriptors.append(.{ try descriptors.append(.{
.family = family, .family = family,
.style = style, .style = style,
.size = config.@"font-size", .size = font_size.points,
.bold = style == null, .bold = style == null,
.variations = config.@"font-variation".list.items, .variations = config.@"font-variation".list.items,
}); });
@ -484,7 +483,7 @@ pub const Key = struct {
try descriptors.append(.{ try descriptors.append(.{
.family = family, .family = family,
.style = style, .style = style,
.size = config.@"font-size", .size = font_size.points,
.italic = style == null, .italic = style == null,
.variations = config.@"font-variation".list.items, .variations = config.@"font-variation".list.items,
}); });
@ -494,7 +493,7 @@ pub const Key = struct {
try descriptors.append(.{ try descriptors.append(.{
.family = family, .family = family,
.style = style, .style = style,
.size = config.@"font-size", .size = font_size.points,
.bold = style == null, .bold = style == null,
.italic = style == null, .italic = style == null,
.variations = config.@"font-variation".list.items, .variations = config.@"font-variation".list.items,
@ -593,7 +592,7 @@ test "Key" {
var keycfg = try DerivedConfig.init(alloc, &cfg); var keycfg = try DerivedConfig.init(alloc, &cfg);
defer keycfg.deinit(); defer keycfg.deinit();
var k = try Key.init(alloc, &keycfg); var k = try Key.init(alloc, &keycfg, .{ .points = 12 });
defer k.deinit(); defer k.deinit();
try testing.expect(k.hashcode() > 0); try testing.expect(k.hashcode() > 0);
@ -612,9 +611,6 @@ test SharedGridSet {
var keycfg = try DerivedConfig.init(alloc, &cfg); var keycfg = try DerivedConfig.init(alloc, &cfg);
defer keycfg.deinit(); defer keycfg.deinit();
var k = try Key.init(alloc, &keycfg);
defer k.deinit();
// Get a grid for the given config // Get a grid for the given config
const key1, const grid1 = try set.ref(&keycfg, .{ .points = 12 }); const key1, const grid1 = try set.ref(&keycfg, .{ .points = 12 });
try testing.expectEqual(@as(usize, 1), set.count()); try testing.expectEqual(@as(usize, 1), set.count());