Changeset 176483 in webkit

Timestamp:

Nov 21, 2014, 4:07:46 PM (12 years ago)

Author:

Conrad Shultz

Message:

Page previews should have a margin.
​https://bugs.webkit.org/show_bug.cgi?id=138990

Reviewed by Beth Dakin.

Enclose the WKWebView (or client-supplied preview view) in a container slightly larger
than the preview view. Adjust sizing code to accommodate the margin.

• UIProcess/mac/WKActionMenuController.mm:

(+[WKPagePreviewViewController previewPadding]):
Return the total amount of fixed padding surrounding the preview
(-[WKPagePreviewViewController loadView]):
Store the actual previewView in an ivar so that clients can distinguish it from the container
view; wrap the preview in a container view; set frames appropriately.
(-[WKActionMenuController _createPreviewPopover]):
Update to reflect method rename; supplement the popover size with the fixed padding.
(-[WKActionMenuController _preferredPopoverSizeWithPreviewPadding:]):
Renamed from -_preferredPopoverSize; account for the fixed padding when computing the preferred size.
(-[WKActionMenuController _clearPreviewPopover]):
Use the previewView ivar instead of the view controller's view.
(-[WKActionMenuController pagePreviewViewControllerWasClicked:]):
Ditto.
(-[WKActionMenuController _preferredPopoverSize]): Deleted.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WKActionMenuController.mm (modified) (11 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-21  Conrad Shultz  <conrad_shultz@apple.com>
+
+        Page previews should have a margin.
+        https://bugs.webkit.org/show_bug.cgi?id=138990
+
+        Reviewed by Beth Dakin.
+
+        Enclose the WKWebView (or client-supplied preview view) in a container slightly larger
+        than the preview view. Adjust sizing code to accommodate the margin.
+
+        * UIProcess/mac/WKActionMenuController.mm:
+        (+[WKPagePreviewViewController previewPadding]):
+        Return the total amount of fixed padding surrounding the preview
+        (-[WKPagePreviewViewController loadView]):
+        Store the actual previewView in an ivar so that clients can distinguish it from the container
+        view; wrap the preview in a container view; set frames appropriately.
+        (-[WKActionMenuController _createPreviewPopover]):
+        Update to reflect method rename; supplement the popover size with the fixed padding.
+        (-[WKActionMenuController _preferredPopoverSizeWithPreviewPadding:]):
+        Renamed from -_preferredPopoverSize; account for the fixed padding when computing the preferred size.
+        (-[WKActionMenuController _clearPreviewPopover]):
+        Use the previewView ivar instead of the view controller's view.
+        (-[WKActionMenuController pagePreviewViewControllerWasClicked:]):
+        Ditto.
+        (-[WKActionMenuController _preferredPopoverSize]): Deleted.
+
 2014-11-21  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm

@@ -72 +72 @@
 #if WK_API_ENABLED
 
+static const CGFloat previewViewInset = 3;
+
 @class WKPagePreviewViewController;
 
@@ -83 +85 @@
     NSSize _mainViewSize;
     RetainPtr<NSURL> _url;
+    RetainPtr<NSView> _previewView;
     id <WKPagePreviewViewControllerDelegate> _delegate;
     CGFloat _popoverToViewScale;
@@ -88 +91 @@
 
 - (instancetype)initWithPageURL:(NSURL *)URL mainViewSize:(NSSize)size popoverToViewScale:(CGFloat)scale;
+
++ (NSSize)previewPadding;
 
 @end
@@ -105 +110 @@
 }
 
++ (NSSize)previewPadding
+{
+    return NSMakeSize(2 * previewViewInset, 2 * previewViewInset);
+}
+
 - (void)loadView
 {
     NSRect defaultFrame = NSMakeRect(0, 0, _mainViewSize.width, _mainViewSize.height);
-    RetainPtr<NSView> previewView = [_delegate pagePreviewViewController:self viewForPreviewingURL:_url.get() initialFrameSize:defaultFrame.size];
-    if (!previewView) {
+    _previewView = [_delegate pagePreviewViewController:self viewForPreviewingURL:_url.get() initialFrameSize:defaultFrame.size];
+    if (!_previewView) {
         RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:defaultFrame]);
         [webView _setIgnoresNonWheelMouseEvents:YES];
@@ -116 +126 @@
             [webView loadRequest:request];
         }
-        previewView = webView;
-    }
+        _previewView = webView;
+    }
+
+    RetainPtr<NSClickGestureRecognizer> clickRecognizer = adoptNS([[NSClickGestureRecognizer alloc] initWithTarget:self action:@selector(_clickRecognized:)]);
+    [_previewView addGestureRecognizer:clickRecognizer.get()];
+
+    NSRect previewFrame = [_previewView frame];
+    NSRect containerFrame = previewFrame;
+    containerFrame.size.width += 2 * previewViewInset;
+    containerFrame.size.height += 2 * previewViewInset;
+    previewFrame = NSOffsetRect(previewFrame, previewViewInset, previewViewInset);
+
+    RetainPtr<NSView> containerView = adoptNS([[NSView alloc] initWithFrame:containerFrame]);
+    [containerView addSubview:_previewView.get()];
+    [_previewView setFrame:previewFrame];
 
     // Setting the webView bounds will scale it to 75% of the _mainViewSize.
-    [previewView setBounds:NSMakeRect(0, 0, _mainViewSize.width / _popoverToViewScale, _mainViewSize.height / _popoverToViewScale)];
-
-    RetainPtr<NSClickGestureRecognizer> clickRecognizer = adoptNS([[NSClickGestureRecognizer alloc] initWithTarget:self action:@selector(_clickRecognized:)]);
-    [previewView addGestureRecognizer:clickRecognizer.get()];
-    self.view = previewView.get();
+    [_previewView setBounds:NSMakeRect(0, 0, _mainViewSize.width / _popoverToViewScale, _mainViewSize.height / _popoverToViewScale)];
+
+    self.view = containerView.get();
 }
 
@@ -351 +372 @@
     _popoverOriginRect = hitTestResult->elementBoundingBox();
 
-    NSSize popoverSize = [self _preferredPopoverSize];
+    NSSize previewPadding = [WKPagePreviewViewController previewPadding];
+    NSSize popoverSize = [self _preferredPopoverSizeWithPreviewPadding:previewPadding];
     CGFloat actualPopoverToViewScale = popoverSize.width / NSWidth(_wkView.bounds);
+    popoverSize.width += previewPadding.width;
+    popoverSize.height += previewPadding.height;
+
     _previewViewController = adoptNS([[WKPagePreviewViewController alloc] initWithPageURL:url mainViewSize:_wkView.bounds.size popoverToViewScale:actualPopoverToViewScale]);
     _previewViewController->_delegate = self;
@@ -388 +413 @@
 }
 
-- (NSSize)_preferredPopoverSize
+- (NSSize)_preferredPopoverSizeWithPreviewPadding:(NSSize)previewPadding
 {
     static const CGFloat preferredPopoverToViewScale = 0.75;
-    static const CGFloat screenPadding = 40;
+    static const NSSize screenPadding = {40, 40};
     static const NSSize smallestPopoverSize = NSMakeSize(500, 300);
+
+    const NSSize effectivePadding = NSMakeSize(screenPadding.width + previewPadding.width, screenPadding.height + previewPadding.height);
 
     NSWindow *window = _wkView.window;
@@ -404 +431 @@
     CGFloat availableSpaceAbove = NSMaxY(screenFrame) - NSMaxY(originScreenRect);
     CGFloat availableSpaceBelow = NSMinY(originScreenRect) - NSMinY(screenFrame);
-    CGFloat maxAvailableVerticalSpace = fmax(availableSpaceAbove, availableSpaceBelow) - screenPadding;
-    NSSize maxSpaceAvailableOnYEdge = NSMakeSize(screenFrame.size.width - screenPadding, maxAvailableVerticalSpace);
+    CGFloat maxAvailableVerticalSpace = fmax(availableSpaceAbove, availableSpaceBelow) - effectivePadding.height;
+    NSSize maxSpaceAvailableOnYEdge = NSMakeSize(screenFrame.size.width - effectivePadding.height, maxAvailableVerticalSpace);
     if (targetSizeFitsInAvailableSpace(targetSize, maxSpaceAvailableOnYEdge) && targetSizeFitsInAvailableSpace(targetSize, largestPopoverSize))
         return targetSize;
@@ -411 +438 @@
     CGFloat availableSpaceAtLeft = NSMinX(originScreenRect) - NSMinX(screenFrame);
     CGFloat availableSpaceAtRight = NSMaxX(screenFrame) - NSMaxX(originScreenRect);
-    CGFloat maxAvailableHorizontalSpace = fmax(availableSpaceAtLeft, availableSpaceAtRight) - screenPadding;
-    NSSize maxSpaceAvailableOnXEdge = NSMakeSize(maxAvailableHorizontalSpace, screenFrame.size.height - screenPadding);
+    CGFloat maxAvailableHorizontalSpace = fmax(availableSpaceAtLeft, availableSpaceAtRight) - effectivePadding.width;
+    NSSize maxSpaceAvailableOnXEdge = NSMakeSize(maxAvailableHorizontalSpace, screenFrame.size.height - effectivePadding.width);
     if (targetSizeFitsInAvailableSpace(targetSize, maxSpaceAvailableOnXEdge) && targetSizeFitsInAvailableSpace(targetSize, largestPopoverSize))
         return targetSize;
@@ -459 +486 @@
     if (_previewViewController) {
         _previewViewController->_delegate = nil;
-        [_wkView _finishPreviewingURL:_previewViewController->_url.get() withPreviewView:[_previewViewController view]];
+        [_wkView _finishPreviewingURL:_previewViewController->_url.get() withPreviewView:_previewViewController->_previewView.get()];
         _previewViewController = nil;
     }
@@ -1064 +1091 @@
 {
     if (NSURL *url = pagePreviewViewController->_url.get())
-        [_wkView _handleClickInPreviewView:pagePreviewViewController.view URL:url];
+        [_wkView _handleClickInPreviewView:pagePreviewViewController->_previewView.get() URL:url];
 }