superrob1500
/
mirror-ghostty
mirror of https://github.com/ghostty-org/ghostty
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Metal: fix crunchy constrained glyphs (#6914) 

Fixes problem pointed out in discussion #6895, as well as adjusting the
constraint logic to account for the offset, since I noticed it was
wrong; the constraint logic now accounts for the x offset, so that the
glyph does not exceed the right edge of the constraint width when the
offset is added, and the offset is zeroed if the glyph is resized down
to fit the constraint width.

|**Before**|**After**|
|-|-|
|<img width="84" alt="image"
src="https://github.com/user-attachments/assets/9561ca40-cfa0-4aed-b192-ee15042d8cbb"
/>|<img width="82" alt="image"
src="https://github.com/user-attachments/assets/9a77ac61-f46d-41de-a859-2b394024f7bc"
/>|

<sup>Zoom in to images for detail if you can't see the
crunchiness.</sup>

> [!NOTE]
> It may be an issue that that glyph is rendered with the constrained
text mode in the first place - Kitty doesn't seem to apply constraint
logic to it, and it seems a little over-eager to do so on our part. This
is something to look in to.
pull/6923/head
Mitchell Hashimoto 2025-03-26 11:20:14 -07:00 committed by GitHub
parent bcff4e18f4 e96f94d8d7
commit 837cdf0556
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/renderer/shaders/cell.metal
View File

@ -425,11 +425,19 @@ vertex CellTextVertexOut cell_text_vertex(
// If we're constrained then we need to scale the glyph. // If we're constrained then we need to scale the glyph.
if (in.mode == MODE_TEXT_CONSTRAINED) { if (in.mode == MODE_TEXT_CONSTRAINED) {
float max_width = uniforms.cell_size.x * in.constraint_width; float max_width = uniforms.cell_size.x * in.constraint_width;
// If this glyph is wider than the constraint width,
// fit it to the width and remove its horizontal offset.
if (size.x > max_width) { if (size.x > max_width) {
float new_y = size.y * (max_width / size.x); float new_y = size.y * (max_width / size.x);
offset.y += (size.y - new_y) / 2; offset.y += (size.y - new_y) / 2;
offset.x = 0;
size.y = new_y; size.y = new_y;
size.x = max_width; size.x = max_width;
} else if (max_width - size.x > offset.x) {
// However, if it does fit in the constraint width, make
// sure the offset is small enough to not push it over the
// right edge of the constraint width.
offset.x = max_width - size.x;
} }
} }
@ -499,7 +507,11 @@ fragment float4 cell_text_fragment(
constexpr sampler textureSampler( constexpr sampler textureSampler(
coord::pixel, coord::pixel,
address::clamp_to_edge, address::clamp_to_edge,
filter::nearest // TODO(qwerasd): This can be changed back to filter::nearest when
// we move the constraint logic out of the GPU code
// which should once again guarantee pixel perfect
// sizing.
filter::linear
); );
switch (in.mode) { switch (in.mode) {