#209: iOS text clipping

objorke · objorke · commit 7f7ba7d4bf27 · 2014-10-11T09:12:25.000+02:00
diff --git a/Source/Examples/ExampleLibrary/Examples/RenderingCapabilities.cs b/Source/Examples/ExampleLibrary/Examples/RenderingCapabilities.cs
@@ -172,6 +172,34 @@ public static PlotModel DrawTextAlignmentRotation()
             return model;
         }
 
+        /// <summary>
+        /// Shows color capabilities for the DrawText method.
+        /// </summary>
+        /// <returns>A plot model.</returns>
+        [Example("DrawText - MaxSize")]
+        public static PlotModel DrawTextMaxSize()
+        {
+            var model = new PlotModel();
+            model.Annotations.Add(new DelegateAnnotation(rc =>
+                {
+                    const string Font = "Arial";
+                    const double FontSize = 32d;
+                    const double FontWeight = FontWeights.Bold;
+                    const double D = FontSize * 1.6;
+                    const double X = 20;
+                    double y = 20 - D;
+                    var testStrings = new []{"iii","jjj","OxyPlot","Bottom","100","KML"};
+                    foreach (var text in testStrings){
+                        var maxSize = rc.MeasureText(text, Font, FontSize, FontWeight);
+                        var p=new ScreenPoint(X, y += D);
+                        rc.DrawText(p, text, OxyColors.Black, Font, FontSize, FontWeight, maxSize: maxSize);
+                        var rect=new OxyRect(p,maxSize);
+                        rc.DrawRectangle(rect,OxyColors.Undefined,OxyColors.Black);
+                    }
+                }));
+            return model;
+        }
+
         /// <summary>
         /// Draws text and shows marks for ascent/descent/baseline/x-height and the expected bounding box.
         /// </summary>
diff --git a/Source/OxyPlot.XamarinIOS/MonoTouchRenderContext.cs b/Source/OxyPlot.XamarinIOS/MonoTouchRenderContext.cs
@@ -315,7 +315,7 @@ public override void DrawText(ScreenPoint p, string text, OxyColor fill, string
 
                     if (maxSize.HasValue || halign != HorizontalAlignment.Left || valign != VerticalAlignment.Bottom)
                     {
-                        width = bounds.Width;
+                        width = bounds.Left + bounds.Width;
                         height = lineHeight;
                     }
                     else
@@ -338,6 +338,8 @@ public override void DrawText(ScreenPoint p, string text, OxyColor fill, string
 
                     var dx = halign == HorizontalAlignment.Left ? 0d : (halign == HorizontalAlignment.Center ? -width * 0.5 : -width);
                     var dy = valign == VerticalAlignment.Bottom ? 0d : (valign == VerticalAlignment.Middle ? height * 0.5 : height);
+                    var x0 = -bounds.Left;
+                    var y0 = delta;
 
                     this.SetFill(fill);
                     this.SetAlias(false);
@@ -349,12 +351,13 @@ public override void DrawText(ScreenPoint p, string text, OxyColor fill, string
                         this.gctx.RotateCTM((float)(rotate / 180 * Math.PI));
                     }
 
-                    this.gctx.TranslateCTM((float)dx - bounds.Left, (float)dy + delta);
+                    this.gctx.TranslateCTM((float)dx + x0, (float)dy + y0);
                     this.gctx.ScaleCTM(1f, -1f);
 
                     if (maxSize.HasValue)
                     {
-                        this.gctx.ClipToRect(new RectangleF(0, 0, (float)Math.Ceiling(width), (float)Math.Ceiling(height)));
+                        var clipRect = new RectangleF (-x0, y0, (float)Math.Ceiling (width), (float)Math.Ceiling (height));
+                        this.gctx.ClipToRect(clipRect);
                     }
 
                     textLine.Draw(this.gctx);
@@ -390,7 +393,7 @@ public override OxySize MeasureText(string text, string fontFamily, double fontS
                     this.GetFontMetrics(font, out lineHeight, out delta);
                     this.gctx.TextPosition = new PointF(0, 0);
                     var bounds = textLine.GetImageBounds(this.gctx);
-                    return new OxySize(bounds.Width, lineHeight);
+                    return new OxySize(bounds.Left + bounds.Width, lineHeight);
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ public override void DrawText(ScreenPoint p, string text, OxyColor fill, string`
`315`	`315`
`316`	`316`	`if (maxSize.HasValue \|\| halign != HorizontalAlignment.Left \|\| valign != VerticalAlignment.Bottom)`
`317`	`317`	`{`
`318`		`- width = bounds.Width;`
	`318`	`+ width = bounds.Left + bounds.Width;`
`319`	`319`	`height = lineHeight;`
`320`	`320`	`}`
`321`	`321`	`else`
`@@ -338,6 +338,8 @@ public override void DrawText(ScreenPoint p, string text, OxyColor fill, string`
`338`	`338`
`339`	`339`	`var dx = halign == HorizontalAlignment.Left ? 0d : (halign == HorizontalAlignment.Center ? -width * 0.5 : -width);`
`340`	`340`	`var dy = valign == VerticalAlignment.Bottom ? 0d : (valign == VerticalAlignment.Middle ? height * 0.5 : height);`
	`341`	`+ var x0 = -bounds.Left;`
	`342`	`+ var y0 = delta;`
`341`	`343`
`342`	`344`	`this.SetFill(fill);`
`343`	`345`	`this.SetAlias(false);`
`@@ -349,12 +351,13 @@ public override void DrawText(ScreenPoint p, string text, OxyColor fill, string`
`349`	`351`	`this.gctx.RotateCTM((float)(rotate / 180 * Math.PI));`
`350`	`352`	`}`
`351`	`353`
`352`		`- this.gctx.TranslateCTM((float)dx - bounds.Left, (float)dy + delta);`
	`354`	`+ this.gctx.TranslateCTM((float)dx + x0, (float)dy + y0);`
`353`	`355`	`this.gctx.ScaleCTM(1f, -1f);`
`354`	`356`
`355`	`357`	`if (maxSize.HasValue)`
`356`	`358`	`{`
`357`		`- this.gctx.ClipToRect(new RectangleF(0, 0, (float)Math.Ceiling(width), (float)Math.Ceiling(height)));`
	`359`	`+ var clipRect = new RectangleF (-x0, y0, (float)Math.Ceiling (width), (float)Math.Ceiling (height));`
	`360`	`+ this.gctx.ClipToRect(clipRect);`
`358`	`361`	`}`
`359`	`362`
`360`	`363`	`textLine.Draw(this.gctx);`
`@@ -390,7 +393,7 @@ public override OxySize MeasureText(string text, string fontFamily, double fontS`
`390`	`393`	`this.GetFontMetrics(font, out lineHeight, out delta);`
`391`	`394`	`this.gctx.TextPosition = new PointF(0, 0);`
`392`	`395`	`var bounds = textLine.GetImageBounds(this.gctx);`
`393`		`- return new OxySize(bounds.Width, lineHeight);`
	`396`	`+ return new OxySize(bounds.Left + bounds.Width, lineHeight);`
`394`	`397`	`}`
`395`	`398`	`}`
`396`	`399`	`}`