Fix enter/exit fullscreen transition, save and load window geometry

Author: foxnne

build.zig

@@ -1158,6 +1158,7 @@ fn addFizzyExecutableForTarget(
         exe.root_module.addCSourceFile(.{ .file = std.Build.path(b, "src/objc/FizzyVisualEffectView.m") });
         exe.root_module.addCSourceFile(.{ .file = std.Build.path(b, "src/objc/FizzyMenuTarget.m") });
         exe.root_module.addCSourceFile(.{ .file = std.Build.path(b, "src/objc/FizzyTrackpadGesture.m") });
+        exe.root_module.addCSourceFile(.{ .file = std.Build.path(b, "src/objc/FizzyWindowMonitor.m") });
     } else if (resolved_target.result.os.tag == .windows) {
         if (b.lazyDependency("zigwin32", .{})) |dep| {
             exe.root_module.addImport("win32", dep.module("win32"));

build.zig.zon

@@ -17,8 +17,8 @@
             .lazy = true,
         },
         .zigwin32 = .{
-            .url = "https://github.com/kristoff-it/zigwin32/archive/1102e9b82e8bd50913b6a78035bfb399ebd8cf97.tar.gz",
-            .hash = "zigwin32-25.0.28-preview-6BfVhYKN5AOvXPVJq4bGZ7C5dM3PbUra4xhKAKOFJGcF",
+            .url = "https://github.com/marlersoft/zigwin32/archive/ec98bb4d9eea532320a8551720a9e3ec6de64994.tar.gz",
+            .hash = "win32-25.0.28-preview-mX5pFWMt5QPTVIGh3r2-OpPunpcCCjApyRbA6Zn6WALH",
             .lazy = true,
         },
         .icons = .{
@@ -27,9 +27,8 @@
             .lazy = true,
         },
         .dvui = .{
-            .url = "https://github.com/foxnne/dvui-dev/archive/b0213e89635f9fc020728101cb106a5404884934.tar.gz",
-            .hash = "dvui-0.5.0-dev-AQFJmTXo9gBEcaOJrsSaM_yT4--HViiNIsyYZNfFnvdW",
-            //.hash = "dvui-0.5.0-dev-AQFJmWbD9gDRbS5aDjZxoh1RG-zUgeSYz9aeFF4QcaaF",
+            .url = "https://github.com/foxnne/dvui-dev/archive/0c9a596fa4362f8cb2cd27b653942ddf3fd7a668.tar.gz",
+            .hash = "dvui-0.5.0-dev-AQFJmahe9wA8Cg9l8-mnlIhigaUqsWEtO3f3X8x3Ei62",
             //.path = "../dvui-dev",
         },
         .assetpack = .{
@@ -43,7 +42,6 @@
         .velopack_zig = .{
             .url = "https://github.com/graphl-tech/velopack-zig/archive/0c2f20635a97fde38cc8000e9fb1a75f891cf37d.tar.gz",
             .hash = "velopack_zig-0.0.1-LzeGcengAACU1f33uDAuLKlWXtek0KCC6i_b3XWeJMjd",
-            //.hash = "velopack_zig-0.0.1-LzeGccHTAAAYj2eidbi80qHljonogPnwU-uHCMYBa1ag",
             //.path = "../velopack-zig",
         },
         .dvui_singleton_app = .{

src/App.zig

@@ -11,6 +11,7 @@ const fizzy = @import("fizzy.zig");
 const auto_update = @import("auto_update.zig");
 const update_notify = @import("update_notify.zig");
 const singleton = @import("singleton.zig");
+const paths = @import("paths.zig");
 
 const App = @This();
 const Editor = fizzy.Editor;
@@ -41,27 +42,45 @@ fn appAllocator() std.mem.Allocator {
 // reach argv through this zig's `process.Init` API.
 var main_init_global: ?std.process.Init = null;
 
+var pref_path_buf: [std.fs.max_path_bytes]u8 = undefined;
+var pref_path_len: usize = 0;
+
+const start_options_base: dvui.App.StartOptions = .{
+    .size = .{ .w = 1200.0, .h = 800.0 },
+    .min_size = .{ .w = 640.0, .h = 480.0 },
+    .title = "fizzy",
+    .icon = icon,
+    .transparent = if (builtin.os.tag == .macos or builtin.os.tag == .windows) true else false,
+    // macOS: Cancel-leading dialog/footer order; other platforms: OK-leading (matches dialog header close vs icon).
+    .window_init_options = .{
+        .button_order = if (builtin.os.tag.isDarwin()) .cancel_ok else .ok_cancel,
+    },
+};
+
+fn startOptions() dvui.App.StartOptions {
+    var opts = start_options_base;
+    if (comptime builtin.target.cpu.arch != .wasm32) {
+        const main_init = dvui.App.main_init orelse return opts;
+        if (paths.configFolderZ(&pref_path_buf, main_init.io, fizzy.processEnviron(), ".")) |pref_path| {
+            pref_path_len = pref_path.len;
+            opts.pref_path = pref_path_buf[0..pref_path_len :0];
+        }
+    }
+    return opts;
+}
+
 // To be a dvui App:
 // * declare "dvui_app"
 // * expose the backend's main function
 // * use the backend's log function
 pub const dvui_app: dvui.App = .{
-    .config = .{
-        .options = .{
-            .size = .{ .w = 1200.0, .h = 800.0 },
-            .min_size = .{ .w = 640.0, .h = 480.0 },
-            .title = "fizzy",
-            .icon = icon,
-            .transparent = if (builtin.os.tag == .macos or builtin.os.tag == .windows) true else false,
-            // macOS: Cancel-leading dialog/footer order; other platforms: OK-leading (matches dialog header close vs icon).
-            .window_init_options = .{
-                .button_order = if (builtin.os.tag.isDarwin()) .cancel_ok else .ok_cancel,
-            },
-        },
-    },
+    .config = .{ .startFn = &startOptions },
     .frameFn = AppFrame,
     .initFn = AppInit,
     .deinitFn = AppDeinit,
+    // Applies macOS window chrome and restores a saved fullscreen Space
+    // before the first frame (no-op elsewhere).
+    .restoreFn = fizzy.backend.restoreWindowState,
 };
 
 pub fn main(main_init: std.process.Init) !u8 {
@@ -160,7 +179,18 @@ pub fn AppInit(win: *dvui.Window) !void {
     // No-op on Windows/Linux/web.
     fizzy.backend.installTrackpadGestureMonitor();
 
+    // macOS window chrome was already applied in restoreWindowState (dvui
+    // restoreFn) before this first frame; zoom restore is handled by the dvui
+    // backend once the window is shown/focused. Windows chrome goes here.
+    if (builtin.os.tag != .macos) {
+        fizzy.backend.setWindowStyle(win);
+    }
+
     update_notify.startLaunchCheck(dvui.io, fizzy.editor.settings.debug_simulate_update_available);
+
+    // From here on the monitor's pump timer may drive frames during macOS
+    // window animations.
+    fizzy.backend.macosLaunchComplete();
 }
 
 // Run as app is shutting down before dvui.Window.deinit()