Changeset 280976 in webkit

Timestamp:

Aug 12, 2021 12:16:04 PM (11 months ago)

Author:

jer.noble@apple.com

Message:

[macOS] Enter fullscreen animation interferes with auto-hiding menu bar
​https://bugs.webkit.org/show_bug.cgi?id=229039
<rdar://79150656>

Reviewed by Eric Carlson.

Source/WebCore:

Add a new utility method to calculate the available screen rect taking menu bar
hiding into account.

• platform/PlatformScreen.h:
• platform/mac/PlatformScreenMac.mm:

(WebCore::screenRectAvoidingMenuBar):

Source/WebKit:

When entering fullscreen, if a user has unchecked the "auto-hide menu bar in fullscreen"
setting, the fullscreen animation will enter to the full screen frame, then snap down once
the animation completes to reveal the menu bar. Instead, use a WebCore utility method to
calculate the screen's frame taking that menu bar into account, and use it for the initial
enter fullscreen animation.

• UIProcess/mac/WKFullScreenWindowController.mm:

(-[WKFullScreenWindowController enterFullScreen:]):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/PlatformScreen.h (modified) (2 diffs)
• WebCore/platform/mac/PlatformScreenMac.mm (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/mac/WKFullScreenWindowController.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-08-12  Jer Noble  <jer.noble@apple.com>
+
+        [macOS] Enter fullscreen animation interferes with auto-hiding menu bar
+        https://bugs.webkit.org/show_bug.cgi?id=229039
+        <rdar://79150656>
+
+        Reviewed by Eric Carlson.
+
+        Add a new utility method to calculate the available screen rect taking menu bar
+        hiding into account.
+
+        * platform/PlatformScreen.h:
+        * platform/mac/PlatformScreenMac.mm:
+        (WebCore::screenRectAvoidingMenuBar):
+
 2021-08-12  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/platform/PlatformScreen.h

@@ -118 +118 @@
 FloatRect screenRectForDisplay(PlatformDisplayID);
 WEBCORE_EXPORT FloatRect screenRectForPrimaryScreen();
+WEBCORE_EXPORT FloatRect availableScreenRect(NSScreen *);
 
 WEBCORE_EXPORT FloatRect toUserSpace(const NSRect&, NSWindow *destination);
@@ -133 +134 @@
 IORegistryGPUID gpuIDForDisplay(PlatformDisplayID);
 IORegistryGPUID gpuIDForDisplayMask(uint32_t);
+
+WEBCORE_EXPORT FloatRect screenRectAvoidingMenuBar(NSScreen *);
 
 #endif // !PLATFORM(MAC)

trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm

@@ -45 +45 @@
 #endif
 
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/PlatformScreenIOS.mm>)
+#import <WebKitAdditions/PlatformScreenMac.h>
+#endif
+
 namespace WebCore {
 
@@ -416 +420 @@
 }
 
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/PlatformScreenIOS.mm>)
+#import <WebKitAdditions/PlatformScreenMac.mm>
+#else
+FloatRect screenRectAvoidingMenuBar(NSScreen* screen)
+{
+    return screen.frame;
+}
+#endif
+
+
 } // namespace WebCore
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-08-12  Jer Noble  <jer.noble@apple.com>
+
+        [macOS] Enter fullscreen animation interferes with auto-hiding menu bar
+        https://bugs.webkit.org/show_bug.cgi?id=229039
+        <rdar://79150656>
+
+        Reviewed by Eric Carlson.
+
+        When entering fullscreen, if a user has unchecked the "auto-hide menu bar in fullscreen"
+        setting, the fullscreen animation will enter to the full screen frame, then snap down once
+        the animation completes to reveal the menu bar. Instead, use a WebCore utility method to
+        calculate the screen's frame taking that menu bar into account, and use it for the initial
+        enter fullscreen animation.
+
+        * UIProcess/mac/WKFullScreenWindowController.mm:
+        (-[WKFullScreenWindowController enterFullScreen:]):
+
 2021-08-12  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm

@@ -228 +228 @@
     if (!screen)
         screen = [NSScreen mainScreen];
-    NSRect screenFrame = [screen frame];
-
+
+    NSRect screenFrame = WebCore::screenRectAvoidingMenuBar(screen);
     NSRect webViewFrame = convertRectToScreen([_webView window], [_webView convertRect:[_webView frame] toView:nil]);