Changeset 241124 in webkit

Timestamp:

Feb 7, 2019 10:22:12 AM (5 years ago)

Author:

achristensen@apple.com

Message:

Shrink and hyphenate safe browsing warning text on watchOS
​https://bugs.webkit.org/show_bug.cgi?id=194361
<rdar://problem/47466549>

Reviewed by Geoffrey Garen.

Some internationalizations use long words that didn't fit on small watches.

• UIProcess/Cocoa/WKSafeBrowsingWarning.mm:

(fontOfSize):
(-[WKSafeBrowsingWarning addContent]):
(-[WKSafeBrowsingTextView initWithAttributedString:forWarning:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/WKSafeBrowsingWarning.mm (modified) (5 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-02-07  Alex Christensen  <achristensen@webkit.org>
+
+        Shrink and hyphenate safe browsing warning text on watchOS
+        https://bugs.webkit.org/show_bug.cgi?id=194361
+        <rdar://problem/47466549>
+
+        Reviewed by Geoffrey Garen.
+
+        Some internationalizations use long words that didn't fit on small watches.
+
+        * UIProcess/Cocoa/WKSafeBrowsingWarning.mm:
+        (fontOfSize):
+        (-[WKSafeBrowsingWarning addContent]):
+        (-[WKSafeBrowsingTextView initWithAttributedString:forWarning:]):
+
 2019-02-07  Miguel Gomez  <magomez@igalia.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/WKSafeBrowsingWarning.mm

@@ -38 +38 @@
 #if HAVE(SAFE_BROWSING)
 #if PLATFORM(WATCHOS)
-constexpr CGFloat marginSize = 10;
+constexpr CGFloat marginSize = 9;
 #else
 constexpr CGFloat marginSize = 20;
@@ -89 +89 @@
     case WarningTextSize::Title:
 #if PLATFORM(WATCHOS)
-        return [UIFont preferredFontForTextStyle:UIFontTextStyleHeadline];
+        return [UIFont preferredFontForTextStyle:UIFontTextStyleSubheadline];
 #else
         return [UIFont preferredFontForTextStyle:UIFontTextStyleLargeTitle];
@@ -290 +290 @@
         NSFontAttributeName:fontOfSize(WarningTextSize::Title),
         NSForegroundColorAttributeName:colorForItem(WarningItem::TitleText, self)
+#if PLATFORM(WATCHOS)
+        , NSHyphenationFactorDocumentAttribute:@1
+#endif
     }] autorelease]);
     auto warning = makeLabel([[[NSAttributedString alloc] initWithString:_warning->warning() attributes:@{
         NSFontAttributeName:fontOfSize(WarningTextSize::Body),
         NSForegroundColorAttributeName:colorForItem(WarningItem::MessageText, self)
+#if PLATFORM(WATCHOS)
+        , NSHyphenationFactorDocumentAttribute:@1
+#endif
     }] autorelease]);
     auto showDetails = makeButton(WarningItem::ShowDetailsButton, self, @selector(showDetailsClicked));
@@ -369 +375 @@
     ViewType *box = _box.get().get();
     ButtonType *showDetails = box.subviews.lastObject;
-    WTFLogAlways("SHOW DETAILS BUTTON? %@", showDetails);
     [showDetails removeFromSuperview];
 
@@ -538 +543 @@
     self.scrollEnabled = NO;
 #endif
+#if PLATFORM(WATCHOS)
+    self.layoutManager.hyphenationFactor = 1;
+#endif
 
     return self;