Changeset 90851 in webkit
- Timestamp:
- Jul 12, 2011 2:38:05 PM (13 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r90844 r90851 1 2011-06-22 Jer Noble <jer.noble@apple.com> 2 3 Full-screen: Don't change the collectionBehavior of the WebView's NSWindow if not necessary 4 https://bugs.webkit.org/show_bug.cgi?id=63217 5 <rdar://problem/9660291> 6 7 Reviewed by Darin Adler. 8 9 Check to see if the NSWindow hosting the WebView is not on the active space before changing the window's 10 collectionBehavior. 11 12 * UIProcess/mac/WKFullScreenWindowController.mm: 13 (-[WKFullScreenWindowController beganExitFullScreenAnimation]): 14 1 15 2011-07-12 Andreas Kling <kling@webkit.org> 2 16 -
trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm
r89161 r90851 326 326 [webWindow setAnimationBehavior:NSWindowAnimationBehaviorNone]; 327 327 #endif 328 // The user may have moved the fullScreen window in Spaces, so temporarily change 329 // the collectionBehavior of the webView's window: 330 NSWindowCollectionBehavior behavior = [webWindow collectionBehavior]; 331 [webWindow setCollectionBehavior:NSWindowCollectionBehaviorCanJoinAllSpaces]; 332 [webWindow orderWindow:NSWindowBelow relativeTo:[[self window] windowNumber]]; 333 [webWindow setCollectionBehavior:behavior]; 328 // If the user has moved the fullScreen window into a new space, temporarily change 329 // the collectionBehavior of the webView's window so that it is pulled into the active space: 330 if (![webWindow isOnActiveSpace]) { 331 NSWindowCollectionBehavior behavior = [webWindow collectionBehavior]; 332 [webWindow setCollectionBehavior:NSWindowCollectionBehaviorCanJoinAllSpaces]; 333 [webWindow orderWindow:NSWindowBelow relativeTo:[[self window] windowNumber]]; 334 [webWindow setCollectionBehavior:behavior]; 335 } else 336 [webWindow orderWindow:NSWindowBelow relativeTo:[[self window] windowNumber]]; 337 334 338 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) 335 339 [webWindow setAnimationBehavior:animationBehavior];
Note: See TracChangeset
for help on using the changeset viewer.