Skip to content

window geometry: experiements #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
david-vanderson wants to merge 1 commit into
base: main
Choose a base branch
from
+40 −25
Open

window geometry: experiements #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/App.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ pub const dvui_app: dvui.App = .{
.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 {
Expand Down Expand Up @@ -113,6 +110,13 @@ pub const std_options: std.Options = .{

// Runs before the first frame, after backend and dvui.Window.init()
pub fn AppInit(win: *dvui.Window) !void {

// Applies macOS window chrome and restores a saved fullscreen Space
// before the first frame (no-op elsewhere).
if (builtin.os.tag == .macos) {
fizzy.backend.restoreWindowState(win);
}

// Snapshot the platform from DVUI's keybind selection. On native this is a
// no-op; on wasm it tells `fizzy.platform.isMacOS()` what browser we're in.
fizzy.platform.cacheFromWindow(win);
Expand Down
55 changes: 33 additions & 22 deletions src/backend_native.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,14 +223,42 @@ pub fn restoreWindowState(win: *dvui.Window) void {

setWindowStyle(win);

var saved_geometry: ?dvui.backend.WindowGeometry = null;
if (back.init_opts_save) |opts| {
saved_geometry = .load(opts);
}

const cocoa = cocoaWindowOf(window) orelse return;
macos_monitor_window = window;
back.macos_pre_begin_sync = macosAppPreBeginSync;
back.begin_hook = macosAppPreBeginSync;
fizzy_macos_window_install_resize_observer(cocoa);

if (!back.pending_fullscreen_restore) return;
back.pending_fullscreen_restore = false;
back.pending_maximize_restore = false;
_ = sdl3.SDL_ShowWindow(window);
//const flags = sdl3.SDL_GetWindowFlags(window);
//if (flags & sdl3.SDL_WINDOW_HIDDEN != 0) {
// if (!sdl3.SDL_ShowWindow(window)) {
// std.log.err("SDL_ShowWindow before launch Space restore failed", .{});
// }
// _ = sdl3.SDL_PumpEvents();
//}

if (saved_geometry) |g| {
if (g.state == .normal) return;
if (g.state == .maximized) {
// Give AppKit a drawable snapshot for the Space enter morph.
//_ = win.end(.{}) catch |err| {
// std.log.err("launch restore prep frame end failed: {any}", .{err});
// return;
//};
//win.begin(win.frame_time_ns) catch |err| {
// std.log.err("launch restore prep frame begin failed: {any}", .{err});
// return;
//};

_ = sdl3.SDL_MaximizeWindow(window);
return;
}
}

// Seed the exit target from raw contentView.bounds (never transition
// targets) so exiting fullscreen later lands on the windowed size.
Expand All @@ -240,28 +268,11 @@ pub fn restoreWindowState(win: *dvui.Window) void {
fizzy_macos_window_read_windowed_bounds(cocoa, &pw, &ph);
if (pw >= 1.0 and ph >= 1.0) {
fizzy_macos_window_seed_windowed_content_points(pw, ph);
} else if (back.normal_geometry) |g| {
} else if (saved_geometry) |g| {
fizzy_macos_window_seed_windowed_content_points(@floatFromInt(g.w), @floatFromInt(g.h));
}
}

const flags = sdl3.SDL_GetWindowFlags(window);
if (flags & sdl3.SDL_WINDOW_HIDDEN != 0) {
if (!sdl3.SDL_ShowWindow(window)) {
std.log.err("SDL_ShowWindow before launch Space restore failed", .{});
}
_ = sdl3.SDL_PumpEvents();
}

// Give AppKit a drawable snapshot for the Space enter morph.
win.begin(win.frame_time_ns) catch |err| {
std.log.err("launch restore prep frame begin failed: {any}", .{err});
return;
};
_ = win.end(.{}) catch |err| {
std.log.err("launch restore prep frame end failed: {any}", .{err});
return;
};

fizzy_macos_window_begin_launch_space_restore();
defer fizzy_macos_window_end_launch_space_restore();
Expand Down