Changeset 176511 in webkit

Timestamp:

Nov 23, 2014, 9:21:13 PM (12 years ago)

Author:

Conrad Shultz

Message:

Page previews should have titles
​https://bugs.webkit.org/show_bug.cgi?id=139020

Reviewed by Tim Horton.

• UIProcess/API/Cocoa/WKViewPrivate.h:

Declare -_titleForPreviewOfURL:.

• UIProcess/API/mac/WKView.mm:

(-[WKView _titleForPreviewOfURL:]):
Stub implementation.

• UIProcess/mac/WKActionMenuController.mm:

(+[WKPagePreviewViewController previewPadding]):
Account for the title height.
(-[WKPagePreviewViewController loadView]):
Set correct autoresize masks on some views; create and configure a title view that is
horizontally and vertically centered.
(-[WKActionMenuController pagePreviewViewController:titleForPreviewOfURL:]):
WKPagePreviewViewControllerDelegate method; wrap -[WKView _titleForPreviewOfURL:].

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKViewPrivate.h (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (1 diff)
• UIProcess/mac/WKActionMenuController.mm (modified) (5 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-23  Conrad Shultz  <conrad_shultz@apple.com>
+
+        Page previews should have titles
+        https://bugs.webkit.org/show_bug.cgi?id=139020
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/WKViewPrivate.h:
+        Declare -_titleForPreviewOfURL:.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView _titleForPreviewOfURL:]):
+        Stub implementation.
+
+        * UIProcess/mac/WKActionMenuController.mm:
+        (+[WKPagePreviewViewController previewPadding]):
+        Account for the title height.
+        (-[WKPagePreviewViewController loadView]):
+        Set correct autoresize masks on some views; create and configure a title view that is
+        horizontally and vertically centered.
+        (-[WKActionMenuController pagePreviewViewController:titleForPreviewOfURL:]):
+        WKPagePreviewViewControllerDelegate method; wrap -[WKView _titleForPreviewOfURL:].
+
 2014-11-22  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h

@@ -124 +124 @@
 
 - (NSView *)_viewForPreviewingURL:(NSURL *)url initialFrameSize:(NSSize)initialFrameSize;
+- (NSString *)_titleForPreviewOfURL:(NSURL *)url;
 - (void)_finishPreviewingURL:(NSURL *)url withPreviewView:(NSView *)previewView;
 - (void)_handleClickInPreviewView:(NSView *)previewView URL:(NSURL *)url;

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -4220 +4220 @@
 }
 
+- (NSString *)_titleForPreviewOfURL:(NSURL *)url
+{
+    return nil;
+}
+
 - (void)_finishPreviewingURL:(NSURL *)url withPreviewView:(NSView *)previewView
 {

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

@@ -73 +73 @@
 
 static const CGFloat previewViewInset = 3;
+static const CGFloat previewViewTitleHeight = 34;
 
 @class WKPagePreviewViewController;
@@ -78 +79 @@
 @protocol WKPagePreviewViewControllerDelegate <NSObject>
 - (NSView *)pagePreviewViewController:(WKPagePreviewViewController *)pagePreviewViewController viewForPreviewingURL:(NSURL *)url initialFrameSize:(NSSize)initialFrameSize;
+- (NSString *)pagePreviewViewController:(WKPagePreviewViewController *)pagePreviewViewController titleForPreviewOfURL:(NSURL *)url;
 - (void)pagePreviewViewControllerWasClicked:(WKPagePreviewViewController *)pagePreviewViewController;
 @end
@@ -112 +114 @@
 + (NSSize)previewPadding
 {
-    return NSMakeSize(2 * previewViewInset, 2 * previewViewInset);
+    return NSMakeSize(2 * previewViewInset, previewViewTitleHeight + 2 * previewViewInset);
 }
 
@@ -134 +136 @@
     NSRect previewFrame = [_previewView frame];
     NSRect containerFrame = previewFrame;
-    containerFrame.size.width += 2 * previewViewInset;
-    containerFrame.size.height += 2 * previewViewInset;
+    NSSize totalPadding = [[self class] previewPadding];
+    containerFrame.size.width += totalPadding.width;
+    containerFrame.size.height += totalPadding.height;
     previewFrame = NSOffsetRect(previewFrame, previewViewInset, previewViewInset);
 
     RetainPtr<NSView> containerView = adoptNS([[NSView alloc] initWithFrame:containerFrame]);
+    [containerView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
     [containerView addSubview:_previewView.get()];
     [_previewView setFrame:previewFrame];
+    [_previewView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+
+    RetainPtr<NSTextField> titleTextField = adoptNS([[NSTextField alloc] init]);
+    [titleTextField setWantsLayer:YES];
+    [titleTextField setAutoresizingMask:NSViewWidthSizable | NSViewMinYMargin];
+    [titleTextField setEditable:NO];
+    [titleTextField setBezeled:NO];
+    [titleTextField setDrawsBackground:NO];
+    [titleTextField setAlignment:NSCenterTextAlignment];
+    [titleTextField setUsesSingleLineMode:YES];
+    [titleTextField setLineBreakMode:NSLineBreakByTruncatingTail];
+    [titleTextField setTextColor:[NSColor labelColor]];
+
+    NSString *title = [_delegate pagePreviewViewController:self titleForPreviewOfURL:_url.get()];
+    if (!title)
+        title = [_url absoluteString];
+
+    [titleTextField setStringValue:title ? title : @""];
+
+    [titleTextField sizeToFit];
+    NSSize titleFittingSize = [titleTextField frame].size;
+    CGFloat textFieldCenteringOffset = (NSMaxY(containerFrame) - NSMaxY(previewFrame) - titleFittingSize.height) / 2;
+
+    NSRect titleFrame = previewFrame;
+    titleFrame.size.height = titleFittingSize.height;
+    titleFrame.origin.y = NSMaxY(previewFrame) + textFieldCenteringOffset;
+    [titleTextField setFrame:titleFrame];
+    [containerView addSubview:titleTextField.get()];
 
     // Setting the webView bounds will scale it to 75% of the _mainViewSize.
@@ -1088 +1120 @@
 }
 
+- (NSString *)pagePreviewViewController:(WKPagePreviewViewController *)pagePreviewViewController titleForPreviewOfURL:(NSURL *)url
+{
+    return [_wkView _titleForPreviewOfURL:url];
+}
+
 - (void)pagePreviewViewControllerWasClicked:(WKPagePreviewViewController *)pagePreviewViewController
 {