From c7753cbf3e0af683d2206d4f1c3fad2cb083645c Mon Sep 17 00:00:00 2001 From: Joshua Holmes Date: Fri, 8 Nov 2024 16:17:06 -0800 Subject: [PATCH] Revert "core: set wayland `size` from `pending_size`" This reverts commit cc6ea87c43a3c6ad09beb368dfa7c6dd97439553. This is no longer needed because it was solving a temporarily solving a problem that was permanently fixed by commit bc2fd832f4e681bf0ed2ab0b63dd2f219bc48942. --- src/core/linux/Wayland.zig | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/core/linux/Wayland.zig b/src/core/linux/Wayland.zig index 3e3447c6ac..e8ecc6f7fb 100644 --- a/src/core/linux/Wayland.zig +++ b/src/core/linux/Wayland.zig @@ -49,7 +49,6 @@ state: *Core, core: *Core, title: [:0]const u8, size: *Core.Size, -pending_size: ?Core.Size = null, surface_descriptor: *gpu.Surface.DescriptorFromWaylandSurface, configured: bool = false, @@ -744,10 +743,6 @@ const xdg_surface_listener = struct { wl.configured = true; } - if (wl.pending_size) |pending_size| { - wl.size.* = pending_size; - wl.pending_size = null; - } setContentAreaOpaque(wl, wl.size.*); } @@ -765,7 +760,7 @@ const xdg_toplevel_listener = struct { _ = states; if (width > 0 and height > 0) { - wl.pending_size = .{ .width = @intCast(width), .height = @intCast(height) }; + wl.size.* = .{ .width = @intCast(width), .height = @intCast(height) }; } }