Fix Cocoa window resize regressions after scaler restore

Prevent Cocoa display startup from resizing the restored window before the first rendered frame, so saved zoom/window size is preserved on launch. Also avoid reselecting the current scaler when Preferences closes, preventing unnecessary graphics hotswap and window resize when no scaler actually changed.

Author: desertkun

fusepb/controllers/PreferencesController.m

@@ -245,12 +245,9 @@ - (void)handleWillClose:(NSNotification *)note
      with a now-removed scaler) rather than show ui_error from
      scaler_select_id every time Preferences closes. */
   int new_scaler = scaler_get_type( settings_current.start_scaler_mode );
-  if( new_scaler >= 0 ) {
-    /* scaler_select_scaler is a no-op when the requested scaler is already
-       current; if it isn't supported on the current machine it returns
-       non-zero and current_scaler is left unchanged. When the scaler does
-       change, the hotswap inside picks up the new bilinear setting via
-       createTexture, so no separate hotswap call is needed for that path. */
+  if( new_scaler >= 0 && new_scaler != current_scaler ) {
+    /* Changing the scaler hotswaps graphics; selecting the current scaler
+       would also hotswap and resize the emulator window when Preferences closes. */
     scaler_select_scaler( new_scaler );
   }
 

ui/cocoa/cocoadisplay.m

@@ -91,6 +91,7 @@
 static uint16_t bw_values[16];
 
 static int display_updated = 0;
+static int window_resize_enabled = 0;
 
 /* This is a rule of thumb for the maximum number of rects that can be updated
    each frame. */
@@ -241,10 +242,10 @@ Callers may be on a worker thread (fuse_init runs on the emulator thread
 static void
 cocoadisplay_resize_window( void )
 {
-  /* Skip during the very first uidisplay_init so the xib's window size is
-     preserved at launch. Subsequent inits (machine change) and every
-     hotswap will resize. */
-  if( !display_ui_initialised || settings_current.full_screen ) return;
+  /* Startup applies the saved scaler before the first rendered frame; let
+     AppKit keep the restored window frame until emulation is visibly running. */
+  if( !display_ui_initialised || !window_resize_enabled ||
+      settings_current.full_screen ) return;
 
   float factor = scaler_get_scaling_factor( current_scaler );
   NSSize size = NSMakeSize( image_width * factor, image_height * factor );
@@ -532,6 +533,8 @@ pixels is NULL on the very first hotswap (before uidisplay_init has run
 {
   int i;
 
+  window_resize_enabled = 1;
+
   if( display_updated ) {
     /* obtain lock for buffered screen */
     [buffered_screen_lock lock];