Title: [177478] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 177478
- Author
- [email protected]
- Date
- 2014-12-17 16:33:49 -0800 (Wed, 17 Dec 2014)
Log Message
Merged r177473. rdar://problems/19286550
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (177477 => 177478)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-18 00:25:29 UTC (rev 177477)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-18 00:33:49 UTC (rev 177478)
@@ -1,5 +1,22 @@
2014-12-17 Matthew Hanson <[email protected]>
+ Merge r177473. rdar://problem/19286550
+
+ 2014-12-17 Beth Dakin <[email protected]>
+
+ Page previews are sometimes sized much smaller than it seems they should be
+ https://bugs.webkit.org/show_bug.cgi?id=139754
+ -and corresponding-
+ rdar://problem/19286550
+
+ Reviewed by Tim Horton.
+
+ Increase the minimum size and add in a missing else!!
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController _preferredPopoverSizeWithPreviewPadding:]):
+
+2014-12-17 Matthew Hanson <[email protected]>
+
Merge r177427. rdar://problem/19237945
2014-12-16 Timothy Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (177477 => 177478)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2014-12-18 00:25:29 UTC (rev 177477)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2014-12-18 00:33:49 UTC (rev 177478)
@@ -376,7 +376,7 @@
{
static const CGFloat preferredPopoverToViewScale = 0.75;
static const NSSize screenPadding = {40, 40};
- static const NSSize smallestPopoverSize = NSMakeSize(500, 300);
+ static const NSSize smallestPopoverSize = NSMakeSize(500, 500);
const NSSize effectivePadding = NSMakeSize(screenPadding.width + previewPadding.width, screenPadding.height + previewPadding.height);
@@ -419,7 +419,8 @@
NSSize computedTargetSize;
if ((maxVerticalTargetSizePreservingAspectRatio.width * maxVerticalTargetSizePreservingAspectRatio.height) > (maxHortizontalTargetSizePreservingAspectRatio.width * maxHortizontalTargetSizePreservingAspectRatio.height))
computedTargetSize = maxVerticalTargetSizePreservingAspectRatio;
- computedTargetSize = maxHortizontalTargetSizePreservingAspectRatio;
+ else
+ computedTargetSize = maxHortizontalTargetSizePreservingAspectRatio;
// Now make sure what we've computed isn't too small.
if (computedTargetSize.width < smallestPopoverSize.width && computedTargetSize.height < smallestPopoverSize.height) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
