From: Jay Freeman (saurik) <saurik@saurik.com>
Date: Sun, 11 Mar 2012 05:55:34 +0000 (+0000)
Subject: Finish re-integrating WinterBoard label code.
X-Git-Tag: v0.9.3904~16
X-Git-Url: https://git.saurik.com/winterboard.git/commitdiff_plain/c570f7cb4b125942a79cbfaab14fc763ea24a75e

Finish re-integrating WinterBoard label code.
---

diff --git a/Library.mm b/Library.mm
index d1cf54e..918978a 100644
--- a/Library.mm
+++ b/Library.mm
@@ -702,7 +702,7 @@ static void $drawLabel$(NSString *label, CGRect rect, NSString *style, NSString
         style = [style stringByAppendingString:custom];
 
     CGSize size = [label sizeWithStyle:style forWidth:rect.size.width];
-    [label drawAtPoint:CGPointMake((rect.size.width - size.width) / 2, 0) withStyle:style];
+    [label drawAtPoint:CGPointMake((rect.size.width - size.width) / 2 + rect.origin.x, rect.origin.y) withStyle:style];
 }
 
 static struct WBStringDrawingState {
@@ -762,7 +762,12 @@ MSInstanceMessageHook7(CGSize, NSString, _drawInRect,withFont,lineBreakMode,alig
 
     NSString *base(state->base_ ?: @"");
     NSString *extra([NSString stringWithFormat:@"text-align: %@", textAlign]);
-    [self drawInRect:rect withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], extra, base, info]];
+
+    if (true)
+        $drawLabel$(self, rect, [NSString stringWithFormat:@"%@;%@", [font markupDescription], base], info);
+    else
+        [self drawInRect:rect withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], extra, base, info]];
+
     return CGSizeZero;
 }