Support alignments other than center for text drawing.

diff --git a/Library.mm b/Library.mm
index 85ee865ed2a9925b28afb65aa7810e035c0db46b..55dfeb02497f51acef549d1198a09262d76c479d 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -717,8 +717,22 @@ MSInstanceMessageHook7(CGSize, NSString, _drawInRect,withFont,lineBreakMode,alig
     if (info == nil)
         return MSOldCall(rect, font, mode, alignment, spacing, emoji, truncation);
 
     if (info == nil)
         return MSOldCall(rect, font, mode, alignment, spacing, emoji, truncation);
 

+    NSString *textAlign;
+    switch (alignment) {
+        default:
+        case WebTextAlignmentLeft:
+            textAlign = @"left";
+            break;
+        case WebTextAlignmentCenter:
+            textAlign = @"center";
+            break;
+        case WebTextAlignmentRight:
+            textAlign = @"right";
+            break;
+    }
+

     NSString *base(state->base_ ?: @"");
     NSString *base(state->base_ ?: @"");

-    NSString *extra(@"text-align: center");
+    NSString *extra([NSString stringWithFormat:@"text-align: %@", textAlign]);

     [self drawInRect:rect withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], extra, base, info]];
     return CGSizeZero;
 }
     [self drawInRect:rect withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], extra, base, info]];
     return CGSizeZero;
 }

diff --git a/WBMarkup.h b/WBMarkup.h
index 24645e00d30461b3e0e9f85fd4fc1f2391ab5fb7..d396a8e87879252da8548294fda4ec4b183389b9 100644 (file)
--- a/WBMarkup.h
+++ b/WBMarkup.h
@@ -7,6 +7,12 @@
 @class WAKWindow;
 @class WebView;
 
 @class WAKWindow;
 @class WebView;
 

+typedef enum {
+    WebTextAlignmentLeft = 0,
+    WebTextAlignmentCenter = 1,
+    WebTextAlignmentRight = 2,
+} WebTextAlignment;
+

 @interface WBMarkup : NSObject {
     /*04*/ WebView *view_;
     /*08*/ DOMDocument *document_;
 @interface WBMarkup : NSObject {
     /*04*/ WebView *view_;
     /*08*/ DOMDocument *document_;