Skip to content

Fix window placement on filter changes #66

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

Merged
desertkun merged 3 commits into from
Aug 6, 2026
Merged

Fix window placement on filter changes #66

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a440c84
Anchor the filter resize at the window's top-left corner
morozov Aug 4, 2026
c8dcad9
Keep the resized window inside the visible screen area
morozov Aug 4, 2026
2b79db7
Leave the window alone when the scaler size is unchanged
morozov Aug 4, 2026
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
73 changes: 62 additions & 11 deletions ui/cocoa/cocoadisplay.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,30 @@
}
}

/* Size the current scaler asks the window's content area to be. A window that
would not fit the screen ends up smaller than this. */
static NSSize
cocoadisplay_scaler_content_size( void )
{
float factor = scaler_get_scaling_factor( current_scaler );

return NSMakeSize( image_width * factor, image_height * factor );
}

/* Content size most recently requested of the window; main thread only.

Holds what was requested rather than what AppKit granted: an oversized
frame comes back shrunk, and asking for that same oversized size again
still has to count as no change.

Seeded at the first rendered frame so that the first scaler change of a
session compares against the scaler in effect rather than against zero,
which would resize a window the user sized by hand and AppKit restored. */
static NSSize last_resized_content_size = { 0.0, 0.0 };

/* Resize the emulator window after an explicit scaler change to match the
unscaled framebuffer times the current scaler factor.
unscaled framebuffer times the current scaler factor, anchored at the
window's top-left corner.

Callers may be on a worker thread (fuse_init runs on the emulator thread
spawned by -[Emulator connectWithPorts:]) or the main thread
Expand All @@ -247,8 +269,7 @@ Callers may be on a worker thread (fuse_init runs on the emulator thread
AppKit keep the restored window frame until emulation is visibly running. */
if( !display_ui_initialised || !window_resize_enabled ) return;

float factor = scaler_get_scaling_factor( current_scaler );
NSSize size = NSMakeSize( image_width * factor, image_height * factor );
NSSize size = cocoadisplay_scaler_content_size();

dispatch_async( dispatch_get_main_queue(), ^{
NSWindow *win = [[DisplayOpenGLView instance] window];
Expand All @@ -259,16 +280,35 @@ Callers may be on a worker thread (fuse_init runs on the emulator thread
read on main. */
if( ( [win styleMask] & NSWindowStyleMaskFullScreen ) != 0 ) return;

/* Preserve the window's perceived centre; setContentSize: would anchor
the top-left and drift the centre across repeated scaler changes. */
/* Recorded past the fullscreen bail above, so a scaler change made in
fullscreen does not claim a resize that never happened. */
if( NSEqualSizes( size, last_resized_content_size ) ) return;
last_resized_content_size = size;

NSRect old = [win frame];
NSRect frame = [win frameRectForContentRect:
NSMakeRect( 0, 0, size.width, size.height )];
frame.origin.x = NSMidX( old ) - frame.size.width / 2.0;
frame.origin.y = NSMidY( old ) - frame.size.height / 2.0;
/* A 4x scaler from a corner-positioned window can otherwise push the
title bar off-screen and make the window hard to recover. */
frame = [win constrainFrameRect:frame toScreen:[win screen]];

/* AppKit's origin is the bottom-left one, so holding the top edge means
moving the origin down as the window grows. */
frame.origin.x = old.origin.x;
frame.origin.y = NSMaxY( old ) - frame.size.height;

/* constrainFrameRect: only keeps the title bar reachable and would leave a
widened window off the right edge. Clamp last-write-wins so a window too
big to fit lands on the top-left. -screen is nil when fully off-screen. */
NSScreen *win_screen = [win screen] ?: [NSScreen mainScreen];
if( win_screen ) {
NSRect visible = [win_screen visibleFrame];

frame.origin.x = MIN( frame.origin.x, NSMaxX( visible ) - frame.size.width );
frame.origin.x = MAX( frame.origin.x, NSMinX( visible ) );
frame.origin.y = MAX( frame.origin.y, NSMinY( visible ) );
frame.origin.y = MIN( frame.origin.y, NSMaxY( visible ) - frame.size.height );
}

/* AppKit trims a frame taller than the visible area, and the 4:3
contentAspectRatio then pulls the width down to match. */
[win setFrame:frame display:YES animate:YES];
});
}
Expand Down Expand Up @@ -537,7 +577,18 @@ pixels is NULL on the very first hotswap (before uidisplay_init has run
{
int i;

window_resize_enabled = 1;
if( !window_resize_enabled ) {
/* Adopt the scaler already in effect as the baseline for the session.
Dispatched because last_resized_content_size belongs to the main
thread and this runs on the emulator one. */
NSSize size = cocoadisplay_scaler_content_size();

dispatch_async( dispatch_get_main_queue(), ^{
last_resized_content_size = size;
});

window_resize_enabled = 1;
}

if( display_updated ) {
/* obtain lock for buffered screen */
Expand Down
Loading