From c000895354b3de9c633d7fa6043f1f576f6c121d Mon Sep 17 00:00:00 2001
From: Andrew de los Reyes <adlr@rivosinc.com>
Date: Fri, 11 Apr 2025 16:13:02 -0700
Subject: [PATCH] OpenGL: Tell GL the true screen size so it can avoid
 stretching content

---
 src/Surface.zig         |  3 +++
 src/renderer/Metal.zig  |  2 ++
 src/renderer/OpenGL.zig | 14 ++++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/src/Surface.zig b/src/Surface.zig
index b9eb9e14a..01e7b414d 100644
--- a/src/Surface.zig
+++ b/src/Surface.zig
@@ -1635,6 +1635,9 @@ fn resize(self: *Surface, size: rendererpkg.ScreenSize) !void {
     self.size.screen = size;
     self.balancePaddingIfNeeded();
 
+    // Update renderer with latest size
+    self.renderer.setTrueSize(size);
+
     // Recalculate our grid size. Because Ghostty supports fluid resizing,
     // its possible the grid doesn't change at all even if the screen size changes.
     // We have to update the IO thread no matter what because we send
diff --git a/src/renderer/Metal.zig b/src/renderer/Metal.zig
index e6f77216f..d8ba88acf 100644
--- a/src/renderer/Metal.zig
+++ b/src/renderer/Metal.zig
@@ -1286,6 +1286,8 @@ pub fn updateFrame(
     }
 }
 
+pub fn setTrueSize(_: *Metal, _: renderer.ScreenSize) void {}
+
 /// Draw the frame to the screen.
 pub fn drawFrame(self: *Metal, surface: *apprt.Surface) !void {
     _ = surface;
diff --git a/src/renderer/OpenGL.zig b/src/renderer/OpenGL.zig
index ba9e5d81f..ee12621c5 100644
--- a/src/renderer/OpenGL.zig
+++ b/src/renderer/OpenGL.zig
@@ -54,6 +54,10 @@ grid_metrics: font.Metrics,
 /// The size of everything.
 size: renderer.Size,
 
+/// The most up to date size of the GLAarea. This comes from the thread where
+/// the resize occurs (UI), rather than the output of rendering.
+true_size: renderer.ScreenSize,
+
 /// The current set of cells to render. Each set of cells goes into
 /// a separate shader call.
 cells_bg: std.ArrayListUnmanaged(CellProgram.Cell),
@@ -394,6 +398,7 @@ pub fn init(alloc: Allocator, options: renderer.Options) !OpenGL {
         .cells = .{},
         .grid_metrics = grid.metrics,
         .size = options.size,
+        .true_size = options.size.screen,
         .gl_state = gl_state,
         .font_grid = grid,
         .font_shaper = shaper,
@@ -2288,6 +2293,10 @@ fn flushAtlasSingle(
     modified.* = atlas.modified.load(.monotonic);
 }
 
+pub fn setTrueSize(self: *OpenGL, new_size: renderer.ScreenSize) void {
+    self.true_size = new_size;
+}
+
 /// Render renders the current cell state. This will not modify any of
 /// the cells.
 pub fn drawFrame(self: *OpenGL, surface: *apprt.Surface) !void {
@@ -2296,6 +2305,11 @@ pub fn drawFrame(self: *OpenGL, surface: *apprt.Surface) !void {
     defer if (single_threaded_draw) self.draw_mutex.unlock();
     const gl_state: *GLState = if (self.gl_state) |*v| v else return;
 
+    if (!self.size.screen.equals(self.true_size)) {
+        self.size.screen = self.true_size;
+        self.deferred_screen_size = .{ .size = self.size };
+    }
+
     // Go through our images and see if we need to setup any textures.
     {
         var image_it = self.images.iterator();