From 72a3d22e698e2f0692f631f589e10069d7505bde Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 14 Nov 2024 14:04:13 -0800
Subject: [PATCH] apprt/gtk: use new size structs

---
 src/apprt/gtk/ResizeOverlay.zig | 5 +++--
 src/renderer/OpenGL.zig         | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/apprt/gtk/ResizeOverlay.zig b/src/apprt/gtk/ResizeOverlay.zig
index 73252ee62..108dcd676 100644
--- a/src/apprt/gtk/ResizeOverlay.zig
+++ b/src/apprt/gtk/ResizeOverlay.zig
@@ -94,13 +94,14 @@ fn gtkUpdate(ud: ?*anyopaque) callconv(.C) c.gboolean {
         return c.FALSE;
     };
 
+    const grid_size = surface.core_surface.size.grid();
     var buf: [32]u8 = undefined;
     const text = std.fmt.bufPrintZ(
         &buf,
         "{d}c ⨯ {d}r",
         .{
-            surface.core_surface.grid_size.columns,
-            surface.core_surface.grid_size.rows,
+            grid_size.columns,
+            grid_size.rows,
         },
     ) catch |err| {
         log.err("unable to format text: {}", .{err});
diff --git a/src/renderer/OpenGL.zig b/src/renderer/OpenGL.zig
index 8c1f662c0..6749645ef 100644
--- a/src/renderer/OpenGL.zig
+++ b/src/renderer/OpenGL.zig
@@ -530,9 +530,7 @@ pub fn displayRealize(self: *OpenGL) !void {
     self.texture_color_resized = 0;
 
     // We need to reset our uniforms
-    if (self.screen_size) |size| {
-        self.deferred_screen_size = .{ .size = size };
-    }
+    self.deferred_screen_size = .{ .size = self.size };
     self.deferred_font_size = .{ .metrics = self.grid_metrics };
     self.deferred_config = .{};
 }