Changeset 181403 in webkit

Timestamp:

Mar 11, 2015, 1:27:42 PM (11 years ago)

Author:

jer.noble@apple.com

Message:

[Mac] Update fullscreen placeholder UI to use Vibrancy.
​https://bugs.webkit.org/show_bug.cgi?id=142586

Reviewed by Eric Carlson.

Update the fullscreen placeholder with a translucent vibrant appearance
using NSVisualEffectView. Since NSVisuaEffectView is only available for
OS X 10.10 and above, wrap the new implementation in a version check and
retain the old implementation.

Drive-by: Update the strings for the placeholder view with new HI guidance
as well.

• English.lproj/Localizable.strings:
• platform/LocalizedStrings.cpp:

(WebCore::clickToExitFullScreenText):

• platform/mac/WebCoreFullScreenPlaceholderView.h:
• platform/mac/WebCoreFullScreenPlaceholderView.mm:

(-[WebCoreFullScreenPlaceholderView setExitWarningVisible:]):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/Localizable.strings (modified) (1 diff)
• platform/LocalizedStrings.cpp (modified) (1 diff)
• platform/mac/WebCoreFullScreenPlaceholderView.h (modified) (1 diff)
• platform/mac/WebCoreFullScreenPlaceholderView.mm (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-11  Jer Noble  <jer.noble@apple.com>
+
+        [Mac] Update fullscreen placeholder UI to use Vibrancy.
+        https://bugs.webkit.org/show_bug.cgi?id=142586
+
+        Reviewed by Eric Carlson.
+
+        Update the fullscreen placeholder with a translucent vibrant appearance
+        using NSVisualEffectView. Since NSVisuaEffectView is only available for
+        OS X 10.10 and above, wrap the new implementation in a version check and
+        retain the old implementation.
+
+        Drive-by: Update the strings for the placeholder view with new HI guidance
+        as well.
+
+        * English.lproj/Localizable.strings:
+        * platform/LocalizedStrings.cpp:
+        (WebCore::clickToExitFullScreenText):
+        * platform/mac/WebCoreFullScreenPlaceholderView.h:
+        * platform/mac/WebCoreFullScreenPlaceholderView.mm:
+        (-[WebCoreFullScreenPlaceholderView setExitWarningVisible:]):
+
 2015-03-11  Timothy Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/English.lproj/Localizable.strings

@@ -168 +168 @@
 
 /* Message to display in browser window when in webkit full screen mode. */
-"Click to exit full screen mode" = "Click to exit full screen mode";
+"Click to Exit Full Screen" = "Click to Exit Full Screen";
 
 /* Subtitle of the label to show on a snapshotted plug-in */

trunk/Source/WebCore/platform/LocalizedStrings.cpp

@@ -1057 +1057 @@
 String clickToExitFullScreenText()
 {
-    return WEB_UI_STRING("Click to exit full screen mode", "Message to display in browser window when in webkit full screen mode.");
+    return WEB_UI_STRING("Click to Exit Full Screen", "Message to display in browser window when in webkit full screen mode.");
 }
 

trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.h

@@ -32 +32 @@
 
 WEBCORE_EXPORT @interface WebCoreFullScreenPlaceholderView : NSView {
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+    RetainPtr<NSVisualEffectView> _effectView;
+    RetainPtr<NSTextField> _exitWarning;
+#else
     RetainPtr<NSView> _exitWarning;
+#endif
     NSObject* _target;
     SEL _action;

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

@@ -46 +46 @@
         return nil;
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+    self.wantsLayer = YES;
+    self.autoresizesSubviews = YES;
+    self.layerContentsPlacement = NSViewLayerContentsPlacementTopLeft;
+    self.layerContentsRedrawPolicy = NSViewLayerContentsRedrawNever;
+
+    _effectView = adoptNS([[NSVisualEffectView alloc] initWithFrame:frameRect]);
+    _effectView.get().wantsLayer = YES;
+    _effectView.get().autoresizesSubviews = YES;
+    _effectView.get().autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
+    _effectView.get().blendingMode = NSVisualEffectBlendingModeWithinWindow;
+    _effectView.get().hidden = YES;
+    _effectView.get().material = NSVisualEffectMaterialLight;
+    _effectView.get().state = NSVisualEffectStateActive;
+    [self addSubview:_effectView.get()];
+
+    _exitWarning = adoptNS([[NSTextField alloc] initWithFrame:NSZeroRect]);
+    _exitWarning.get().autoresizingMask = NSViewMinXMargin | NSViewMaxXMargin | NSViewMinYMargin | NSViewMaxYMargin;
+    _exitWarning.get().bordered = NO;
+    _exitWarning.get().drawsBackground = NO;
+    _exitWarning.get().editable = NO;
+    _exitWarning.get().font = [NSFont systemFontOfSize:27];
+    _exitWarning.get().selectable = NO;
+    _exitWarning.get().stringValue = clickToExitFullScreenText();
+    _exitWarning.get().textColor = [NSColor tertiaryLabelColor];
+    [_exitWarning sizeToFit];
+
+    NSRect warningFrame = [_exitWarning.get() frame];
+    warningFrame.origin = NSMakePoint((frameRect.size.width - warningFrame.size.width) / 2, frameRect.size.height / 2);
+    _exitWarning.get().frame = warningFrame;
+    [_effectView addSubview:_exitWarning.get()];
+#else
     [self setLayer:[CALayer layer]];
     [self setLayerContentsRedrawPolicy:NSViewLayerContentsRedrawNever];
@@ -56 +88 @@
     [_exitWarning.get() setHidden:YES];
     [self addSubview:_exitWarning.get()];
+#endif
 
     return self;
@@ -76 +109 @@
 - (void)setExitWarningVisible:(BOOL)visible
 {
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+    [_effectView setHidden:!visible];
+#else
     [_exitWarning.get() setHidden:!visible];
     if (visible) {
@@ -84 +120 @@
     } else
         [[self layer] setFilters:nil];
+#endif
 }