From 072d54bc3a82f5100b62313a80c21f7e0e4669dd Mon Sep 17 00:00:00 2001
From: Aaron Ruan <i@ar212.com>
Date: Fri, 27 Jun 2025 12:05:25 +0800
Subject: [PATCH] implement animated underline cursor and correct its position

---
 src/font/sprite/Face.zig   | 1 +
 src/font/sprite/cursor.zig | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/font/sprite/Face.zig b/src/font/sprite/Face.zig
index 29be7937e..1f6f6b77f 100644
--- a/src/font/sprite/Face.zig
+++ b/src/font/sprite/Face.zig
@@ -133,6 +133,7 @@ pub fn renderGlyph(
                 width,
                 metrics.cursor_height,
                 metrics.cursor_thickness,
+                metrics.underline_position,
             );
 
             // Cursors are drawn at their specified height
diff --git a/src/font/sprite/cursor.zig b/src/font/sprite/cursor.zig
index 8a5f9a6b9..69279199c 100644
--- a/src/font/sprite/cursor.zig
+++ b/src/font/sprite/cursor.zig
@@ -14,6 +14,7 @@ pub fn renderGlyph(
     width: u32,
     height: u32,
     thickness: u32,
+    underline_pos: u32,
 ) !font.Glyph {
     // Make a canvas of the desired size
     var canvas = try font.sprite.Canvas.init(alloc, width, height);
@@ -45,7 +46,7 @@ pub fn renderGlyph(
         }, .on),
         Sprite.cursor_underline => canvas.rect(.{
             .x = 0,
-            .y = height -| thickness,
+            .y = 0,
             .width = width,
             .height = thickness,
         }, .on),
@@ -61,9 +62,9 @@ pub fn renderGlyph(
         //       uniform code. -- In the future code will be introduced to
         //       auto-crop the canvas so that this isn't needed.
         .width = if (sprite == .cursor_bar) thickness else width,
-        .height = height,
+        .height = if (sprite == .cursor_underline) thickness else height,
         .offset_x = 0,
-        .offset_y = @intCast(height),
+        .offset_y = if (sprite == .cursor_underline) @intCast(height -| underline_pos) else @intCast(height),
         .atlas_x = region.x,
         .atlas_y = region.y,
         .advance_x = @floatFromInt(width),