Remove EbrCenterTextInRectVertically (#1882)

Changes UITabBarButton to directly center text vertically in drawRect: Removes dead code from UITextView-sizeThatFits: Fixes #1812
microsoft · Feb 1, 2017 · bb8777c · bb8777c
1 parent 1f0515a
commit bb8777c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/Frameworks/UIKit/UITabBarButton.mm b/Frameworks/UIKit/UITabBarButton.mm
@@ -126,15 +126,9 @@ - (void)drawRect:(CGRect)pos {
         id font = [UIFont defaultFont];
         size = [title sizeWithFont:font constrainedToSize:CGSizeMake(0.0f, 0.0f) lineBreakMode:UILineBreakModeClip];
 
-        CGRect textRect;
-        textRect.origin.y = rect.size.height - size.height;
-        textRect.origin.x = rect.origin.x;
-        textRect.size.width = rect.size.width;
-        textRect.size.height = size.height;
-        // TODO(DH)
-        // EbrCenterTextInRectVertically(&textRect, &size, font);
-
-        CGContextSetFillColorWithColor(context, (CGColorRef)[UIColor whiteColor]);
+        // Vertically center text
+        CGRect textRect = CGRectMake((rect.size.height - size.height) / 2.0, rect.origin.x, rect.size.width, size.height);
+        CGContextSetFillColorWithColor(context, CGColorGetConstantColor(kCGColorWhite));
         size = [title drawInRect:textRect withFont:font lineBreakMode:UILineBreakModeClip alignment:UITextAlignmentCenter];
     }
 }

diff --git a/Frameworks/UIKit/UITextView.mm b/Frameworks/UIKit/UITextView.mm
@@ -757,15 +757,6 @@ - (CGSize)sizeThatFits:(CGSize)fitSize {
     CGSize fontExtent = { 0, 0 };
 
     fontExtent = [[self _text] sizeWithFont:(id)_font forWidth:rect.size.width lineBreakMode:UILineBreakModeWordWrap];
-
-    CGRect centerRect;
-    centerRect.origin.x = 0;
-    centerRect.origin.y = 0;
-    centerRect.size = fontExtent;
-    // TODO(DH)
-    // EbrCenterTextInRectVertically(&centerRect, &fontExtent, _font);
-    rect.origin.y += centerRect.origin.y;
-
     ret.width = ourRect.size.width;
     ret.height = fontExtent.height + _marginSize * 2.0f;