Changeset 218052 in webkit

Timestamp:

Jun 10, 2017 11:33:08 AM (7 years ago)

Author:

mitz@apple.com

Message:

[macOS] REGRESSION: Link drag images blend into the background in Sierra and earlier
​https://bugs.webkit.org/show_bug.cgi?id=172933
<rdar://problem/32580649>

Reviewed by Tim Horton.

• platform/mac/DragImageMac.mm:

(WebCore::createDragImageForLink): When targeting macOS Sierra and earlier, give the link

drag image a drop shadow that resembles the one that macOS High Sierra applies to drag
image layers.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/DragImageMac.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-06-10  Dan Bernstein  <mitz@apple.com>
+
+        [macOS] REGRESSION: Link drag images blend into the background in Sierra and earlier
+        https://bugs.webkit.org/show_bug.cgi?id=172933
+        <rdar://problem/32580649>
+
+        Reviewed by Tim Horton.
+
+        * platform/mac/DragImageMac.mm:
+        (WebCore::createDragImageForLink): When targeting macOS Sierra and earlier, give the link
+          drag image a drop shadow that resembles the one that macOS High Sierra applies to drag
+          image layers.
+
 2017-06-10  Andy Estes  <aestes@apple.com>
 

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

@@ -155 +155 @@
 }
 
-
 const CGFloat linkImagePadding = 10;
 const CGFloat linkImageDomainBaselineToTitleBaseline = 18;
@@ -162 +161 @@
 const CGFloat linkImageFontSize = 11;
 const CFIndex linkImageTitleMaximumLineCount = 2;
-const int linkImageDragCornerOutsetX = 6;
-const int linkImageDragCornerOutsetY = 10;
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
+const int linkImageShadowRadius = 0;
+const int linkImageShadowOffsetY = 0;
+#else
+const int linkImageShadowRadius = 9;
+const int linkImageShadowOffsetY = -3;
+#endif
+const int linkImageDragCornerOutsetX = 6 - linkImageShadowRadius;
+const int linkImageDragCornerOutsetY = 10 - linkImageShadowRadius + linkImageShadowOffsetY;
 
 IntPoint dragOffsetForLinkDragImage(DragImageRef dragImage)
@@ -288 +294 @@
     LinkImageLayout layout(url, title);
 
-    RetainPtr<NSImage> dragImage = adoptNS([[NSImage alloc] initWithSize:layout.boundingRect.size()]);
+    auto imageSize = layout.boundingRect.size();
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
+    imageSize.expand(2 * linkImageShadowRadius, 2 * linkImageShadowRadius - linkImageShadowOffsetY);
+#endif
+    RetainPtr<NSImage> dragImage = adoptNS([[NSImage alloc] initWithSize:imageSize]);
     [dragImage lockFocus];
 
     GraphicsContext context((CGContextRef)[NSGraphicsContext currentContext].graphicsPort);
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
+    context.translate(linkImageShadowRadius, linkImageShadowRadius - linkImageShadowOffsetY);
+    context.setShadow({ 0, linkImageShadowOffsetY }, linkImageShadowRadius, { 0.f, 0.f, 0.f, .25 });
+#endif
     context.fillRoundedRect(FloatRoundedRect(layout.boundingRect, FloatRoundedRect::Radii(linkImageCornerRadius)), Color::white);
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
+    context.clearShadow();
+#endif
 
     for (const auto& label : layout.labels) {