Skip to content

Commit dde4840

Browse files
author
Jay
committed
Letter spacing is relative to text size
1 parent 843ffdf commit dde4840

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

build.zig.zon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.{
22
.name = .engine,
3-
.version = "0.2.7",
3+
.version = "0.2.8",
44
.fingerprint = 0xe8a81a8d0aa558d5,
55
.minimum_zig_version = "0.14.1",
66
.dependencies = .{

src/engine.zig

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1357,7 +1357,7 @@ pub const Element = struct {
13571357
) void {
13581358
var x = element.rect.x + element.pad.left;
13591359
const y = element.rect.y + element.pad.top;
1360-
const word_spacing = display.text_height / 3.0 * display.scale;
1360+
const word_spacing = display.text_height / 4.0 * display.scale;
13611361

13621362
if (display.selected != null and element == display.selected.?) {
13631363
// Draw cursor
@@ -2018,7 +2018,6 @@ inline fn draw_text_elements(
20182018

20192019
var x: f32 = element.rect.x + element.pad.left;
20202020
var y: f32 = element.rect.y + element.pad.top;
2021-
const word_spacing = display.text_height / 3.0 * display.scale;
20222021
const x_start: f32 = @floor(x);
20232022

20242023
const x_ending = switch (element.type) {
@@ -2042,6 +2041,8 @@ inline fn draw_text_elements(
20422041
else => unreachable,
20432042
};
20442043

2044+
const word_spacing = display.text_height * display.scale * text_height.height() / 4.0;
2045+
20452046
var lines: usize = 0;
20462047
// A line must have at least one word before a line break is inserted
20472048
// otherwise we are just drawing pointless broken blank lines.
@@ -2162,8 +2163,6 @@ inline fn text_elements_size(
21622163
max_width -= display.checkbox().width;
21632164
}
21642165

2165-
const word_spacing = display.text_height / 3.0 * display.scale;
2166-
21672166
const text_height: TextSize = if (element.type == .label)
21682167
element.type.label.text_size
21692168
else
@@ -2174,6 +2173,8 @@ inline fn text_elements_size(
21742173
else
21752174
element.type.checkbox.elements.items;
21762175

2176+
const word_spacing = display.text_height * display.scale * text_height.height() / 3.0;
2177+
21772178
var lines: usize = 0;
21782179
// A line must have at least one word before a line break is inserted
21792180
// otherwise we are just drawing pointless broken blank lines.

0 commit comments

Comments
 (0)