#209: Android text clipping and positioning

objorke · objorke · commit fdbc0d53de41 · 2014-10-13T21:44:07.000+02:00
diff --git a/Source/Examples/ExampleLibrary/Examples/RenderingCapabilities.cs b/Source/Examples/ExampleLibrary/Examples/RenderingCapabilities.cs
@@ -19,7 +19,7 @@ namespace ExampleLibrary
     /// <summary>
     /// Provides rendering capability examples.
     /// </summary>
-    [Examples("Rendering capabilities")]
+    [Examples("9 Rendering capabilities")]
     public class RenderingCapabilities
     {
         /// <summary>
@@ -187,14 +187,24 @@ public static PlotModel DrawTextMaxSize()
                     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){
+                    const double X2 = 200;
+                    double y = 20;
+                    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);
+                        var p = new ScreenPoint(X, y);
                         rc.DrawText(p, text, OxyColors.Black, Font, FontSize, FontWeight, maxSize: maxSize);
-                        var rect=new OxyRect(p,maxSize);
-                        rc.DrawRectangle(rect,OxyColors.Undefined,OxyColors.Black);
+                        var rect = new OxyRect(p, maxSize);
+                        rc.DrawRectangle(rect, OxyColors.Undefined, OxyColors.Black);
+
+                        var p2 = new ScreenPoint(X2, y);
+                        var maxSize2 = new OxySize(maxSize.Width / 2, maxSize.Height / 2);
+                        rc.DrawText(p2, text, OxyColors.Black, Font, FontSize, FontWeight, maxSize: maxSize2);
+                        var rect2 = new OxyRect(p2, maxSize2);
+                        rc.DrawRectangle(rect2, OxyColors.Undefined, OxyColors.Black);
+
+                        y += D;
                     }
                 }));
             return model;
@@ -227,7 +237,7 @@ public static PlotModel DrawTextWithWinFormsMetricsDefault()
         [Example("DrawText - WinForms metrics (StringFormat = GenericTypographic)")]
         public static PlotModel DrawTextWithWinFormsMetricsTypographic()
         {
-            return DrawTextWithMetrics("OxyPlot", "Arial", 60, 224.1, 71.5, 108, 73, 61, 121, 23,242, "WinForms");
+            return DrawTextWithMetrics("OxyPlot", "Arial", 60, 224.1, 71.5, 108, 73, 61, 121, 23, 242, "WinForms");
         }
 
         /// <summary>
diff --git a/Source/Examples/ExampleLibrary/Showcases/ShowCases.cs b/Source/Examples/ExampleLibrary/Showcases/ShowCases.cs
@@ -18,7 +18,7 @@ namespace ExampleLibrary
     /// <summary>
     /// Showcase models
     /// </summary>
-    [Examples("_ShowCases_")]
+    [Examples("1 ShowCases")]
     [Tags("Showcase")]
     public class ShowCases
     {
diff --git a/Source/OxyPlot.XamarinAndroid/CanvasRenderContext.cs b/Source/OxyPlot.XamarinAndroid/CanvasRenderContext.cs
@@ -272,9 +272,8 @@ public override void DrawText(ScreenPoint p, string text, OxyColor fill, string
         {
             this.paint.Reset();
             {
-                this.paint.AntiAlias = true;
                 this.paint.TextSize = this.Convert(fontSize);
-                this.paint.Color = fill.ToColor();
+                this.SetFill(fill);
 
                 float width;
                 float height;
@@ -283,7 +282,7 @@ public override void DrawText(ScreenPoint p, string text, OxyColor fill, string
                 if (maxSize.HasValue || halign != HorizontalAlignment.Left || valign != VerticalAlignment.Bottom)
                 {
                     this.paint.GetTextBounds(text, 0, text.Length, this.bounds);
-                    width = this.bounds.Width();
+                    width = this.bounds.Left + this.bounds.Width();
                     height = lineHeight;
                 }
                 else
@@ -301,23 +300,28 @@ public override void DrawText(ScreenPoint p, string text, OxyColor fill, string
                         width = maxWidth;
                     }
 
-                    if (height > maxSize.Value.Height)
+                    if (height > maxHeight)
                     {
                         height = maxHeight;
                     }
                 }
 
                 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 = -this.bounds.Left;
+                var y0 = delta;
 
                 this.canvas.Save();
                 this.canvas.Translate(this.Convert(p.X), this.Convert(p.Y));
                 this.canvas.Rotate((float)rotate);
-                this.canvas.Translate((float)dx, (float)dy + delta);
+                this.canvas.Translate((float)dx + x0, (float)dy + y0);
 
                 if (maxSize.HasValue)
                 {
-                    this.canvas.ClipRect(0, -height, this.Convert(maxSize.Value.Width), 0);
+                    var x1 = -x0;
+                    var y1 = -height - y0;
+                    this.canvas.ClipRect(x1, y1, x1 + width, y1 + height);
+                    this.canvas.Translate(0, lineHeight - height);
                 }
 
                 this.canvas.DrawText(text, 0, 0, this.paint);
@@ -438,7 +442,7 @@ public override void CleanUp()
         /// <param name="delta">The vertical delta.</param>
         private void GetFontMetrics(Paint paint, out float defaultLineHeight, out float delta)
         {
-            var metrics = paint.GetFontMetrics ();
+            var metrics = paint.GetFontMetrics();
             var ascent = -metrics.Ascent;
             var descent = metrics.Descent;
             var leading = metrics.Leading;

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace ExampleLibrary`
`18`	`18`	`/// <summary>`
`19`	`19`	`/// Showcase models`
`20`	`20`	`/// </summary>`
`21`		`- [Examples("_ShowCases_")]`
	`21`	`+ [Examples("1 ShowCases")]`
`22`	`22`	`[Tags("Showcase")]`
`23`	`23`	`public class ShowCases`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -272,9 +272,8 @@ public override void DrawText(ScreenPoint p, string text, OxyColor fill, string`
`272`	`272`	`{`
`273`	`273`	`this.paint.Reset();`
`274`	`274`	`{`
`275`		`- this.paint.AntiAlias = true;`
`276`	`275`	`this.paint.TextSize = this.Convert(fontSize);`
`277`		`- this.paint.Color = fill.ToColor();`
	`276`	`+ this.SetFill(fill);`
`278`	`277`
`279`	`278`	`float width;`
`280`	`279`	`float height;`
`@@ -283,7 +282,7 @@ public override void DrawText(ScreenPoint p, string text, OxyColor fill, string`
`283`	`282`	`if (maxSize.HasValue \|\| halign != HorizontalAlignment.Left \|\| valign != VerticalAlignment.Bottom)`
`284`	`283`	`{`
`285`	`284`	`this.paint.GetTextBounds(text, 0, text.Length, this.bounds);`
`286`		`- width = this.bounds.Width();`
	`285`	`+ width = this.bounds.Left + this.bounds.Width();`
`287`	`286`	`height = lineHeight;`
`288`	`287`	`}`
`289`	`288`	`else`
`@@ -301,23 +300,28 @@ public override void DrawText(ScreenPoint p, string text, OxyColor fill, string`
`301`	`300`	`width = maxWidth;`
`302`	`301`	`}`
`303`	`302`
`304`		`- if (height > maxSize.Value.Height)`
	`303`	`+ if (height > maxHeight)`
`305`	`304`	`{`
`306`	`305`	`height = maxHeight;`
`307`	`306`	`}`
`308`	`307`	`}`
`309`	`308`
`310`	`309`	`var dx = halign == HorizontalAlignment.Left ? 0d : (halign == HorizontalAlignment.Center ? -width * 0.5 : -width);`
`311`	`310`	`var dy = valign == VerticalAlignment.Bottom ? 0d : (valign == VerticalAlignment.Middle ? height * 0.5 : height);`
	`311`	`+ var x0 = -this.bounds.Left;`
	`312`	`+ var y0 = delta;`
`312`	`313`
`313`	`314`	`this.canvas.Save();`
`314`	`315`	`this.canvas.Translate(this.Convert(p.X), this.Convert(p.Y));`
`315`	`316`	`this.canvas.Rotate((float)rotate);`
`316`		`- this.canvas.Translate((float)dx, (float)dy + delta);`
	`317`	`+ this.canvas.Translate((float)dx + x0, (float)dy + y0);`
`317`	`318`
`318`	`319`	`if (maxSize.HasValue)`
`319`	`320`	`{`
`320`		`- this.canvas.ClipRect(0, -height, this.Convert(maxSize.Value.Width), 0);`
	`321`	`+ var x1 = -x0;`
	`322`	`+ var y1 = -height - y0;`
	`323`	`+ this.canvas.ClipRect(x1, y1, x1 + width, y1 + height);`
	`324`	`+ this.canvas.Translate(0, lineHeight - height);`
`321`	`325`	`}`
`322`	`326`
`323`	`327`	`this.canvas.DrawText(text, 0, 0, this.paint);`
`@@ -438,7 +442,7 @@ public override void CleanUp()`
`438`	`442`	`/// <param name="delta">The vertical delta.</param>`
`439`	`443`	`private void GetFontMetrics(Paint paint, out float defaultLineHeight, out float delta)`
`440`	`444`	`{`
`441`		`- var metrics = paint.GetFontMetrics ();`
	`445`	`+ var metrics = paint.GetFontMetrics();`
`442`	`446`	`var ascent = -metrics.Ascent;`
`443`	`447`	`var descent = metrics.Descent;`
`444`	`448`	`var leading = metrics.Leading;`