Merge branch 'sumibi-yakitori/fix-maximize-window-macos' into 'main'

macos: prohibit fullscreen transition if in transtion

This prevents performing additional fullscreen transitions while
a transition is already in progress.

Closes #4808

See merge request GNOME/gtk!4612

(cherry picked from commit 15b7a4572b3a06aefed75bb7989c711763af65f7)

69a0a5cf macos: Prohibit changing the full-screen state of a window during a full-screen transition
229e4b58 macos: Corrected code style

diff --git a/gdk/macos/GdkMacosWindow.c b/gdk/macos/GdkMacosWindow.c
index 23b3f5a3f3bd451463ed4889d7d6f1ad6eef2e41..0eb1ec7ca8a533e98b3bb84cb233a6d82b0ade8f 100644 (file)
--- a/gdk/macos/GdkMacosWindow.c
+++ b/gdk/macos/GdkMacosWindow.c
@@ -171,6 +171,11 @@ typedef NSString *CALayerContentsGravity;
   return inMove;
 }
 
+- (BOOL)inFullscreenTransition;
+{
+  return inFullscreenTransition;
+}
+
 -(void)checkSendEnterNotify
 {
   /* When a new window has been created, and the mouse is in the window
@@ -759,31 +764,37 @@ typedef NSString *CALayerContentsGravity;
 
 -(void)windowWillEnterFullScreen:(NSNotification *)aNotification
 {
+  inFullscreenTransition = YES;
   lastUnfullscreenFrame = [self frame];
 }
 
 -(void)windowDidEnterFullScreen:(NSNotification *)aNotification
 {
+  inFullscreenTransition = NO;
   initialPositionKnown = NO;
   [self checkSendEnterNotify];
 }
 
 -(void)windowWillExitFullScreen:(NSNotification *)aNotification
 {
+  inFullscreenTransition = YES;
 }
 
 -(void)windowDidExitFullScreen:(NSNotification *)aNotification
 {
+  inFullscreenTransition = NO;
   initialPositionKnown = NO;
   [self checkSendEnterNotify];
 }
 
 -(void)windowDidFailToEnterFullScreen:(NSNotification *)aNotification
 {
+  inFullscreenTransition = NO;
 }
 
 -(void)windowDidFailToExitFullScreen:(NSNotification *)aNotification
 {
+  inFullscreenTransition = NO;
 }
 
 -(void)windowDidChangeScreen:(NSNotification *)aNotification

diff --git a/gdk/macos/GdkMacosWindow.h b/gdk/macos/GdkMacosWindow.h
index 3a514ea85707ae1123f75a52f8c36e04b2134d76..1cf9ec805c0c22f3afd2fb1c7f12800a40d20189 100644 (file)
--- a/gdk/macos/GdkMacosWindow.h
+++ b/gdk/macos/GdkMacosWindow.h
@@ -53,6 +53,7 @@
   NSRect           lastMaximizedFrame;
   NSRect           lastUnfullscreenFrame;
   BOOL             inMaximizeTransition;
+  BOOL             inFullscreenTransition;
 }
 
 -(void)beginManualMove;
@@ -70,5 +71,6 @@
 -(void)setDecorated:(BOOL)decorated;
 -(void)swapBuffer:(GdkMacosBuffer *)buffer withDamage:(const cairo_region_t *)damage;
 -(BOOL)needsMouseDownQuirk;
+-(BOOL)inFullscreenTransition;
 
 @end

diff --git a/gdk/macos/gdkmacostoplevelsurface.c b/gdk/macos/gdkmacostoplevelsurface.c
index 1759077563597ec05e3deedb263efd0b87b99c15..aa828fcfa5e336ec313a314fbd5d9f1588c67dbf 100644 (file)
--- a/gdk/macos/gdkmacostoplevelsurface.c
+++ b/gdk/macos/gdkmacostoplevelsurface.c
@@ -33,26 +33,26 @@
 static void
 _gdk_macos_toplevel_surface_fullscreen (GdkMacosToplevelSurface *self)
 {
-  NSWindow *window;
+  GdkMacosWindow *window;
 
   g_assert (GDK_IS_MACOS_TOPLEVEL_SURFACE (self));
 
-  window = _gdk_macos_surface_get_native (GDK_MACOS_SURFACE (self));
+  window = (GdkMacosWindow *)_gdk_macos_surface_get_native (GDK_MACOS_SURFACE (self));
 
-  if (([window styleMask] & NSWindowStyleMaskFullScreen) == 0)
+  if (![window inFullscreenTransition] && ([window styleMask] & NSWindowStyleMaskFullScreen) == 0)
     [window toggleFullScreen:window];
 }
 
 static void
 _gdk_macos_toplevel_surface_unfullscreen (GdkMacosToplevelSurface *self)
 {
-  NSWindow *window;
+  GdkMacosWindow *window;
 
   g_assert (GDK_IS_MACOS_TOPLEVEL_SURFACE (self));
 
-  window = _gdk_macos_surface_get_native (GDK_MACOS_SURFACE (self));
+  window = (GdkMacosWindow *)_gdk_macos_surface_get_native (GDK_MACOS_SURFACE (self));
 
-  if (([window styleMask] & NSWindowStyleMaskFullScreen) != 0)
+  if (![window inFullscreenTransition] && ([window styleMask] & NSWindowStyleMaskFullScreen) != 0)
     [window toggleFullScreen:window];
 }