Ceil measured text sizes in WinForms (#1659) (#1691)

VisualMelon · web-flow · commit eeeb7ddc1adb · 2020-10-11T18:41:02.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -113,6 +113,7 @@ All notable changes to this project will be documented in this file.
 - OpenStreetMap example (#1642)
 - Incorrect clipping in TwoColorAreaSeries (#1678)
 - ScreenMin and ScreenMax on Horizontal and Vertical Axes depends on plot bounds (#1652)
+- Windows Forms clipping last line of measured text (#1659)
 
 ## [2.0.0] - 2019-10-19
 ### Added 
diff --git a/Source/Examples/ExampleLibrary/Issues/Issues.cs b/Source/Examples/ExampleLibrary/Issues/Issues.cs
@@ -2359,6 +2359,19 @@ public static PlotModel ZeroCrossingWithInsertHorizontalAxisAndTransparentBorder
             return plotModel1;
         }
 
+        [Example("#1659: Last line of series titles in legend not displayed in Chinese on WinForms (Closed)")]
+        public static PlotModel LastLineOfSeriesTitlesNotDisplayedInChineseOnWindows()
+        {
+            var plot = new PlotModel() { Title = "#1659: Last line of series titles in legend not displayed in Chinese on WinForms" };
+
+            plot.Legends.Add(new Legend() { LegendTitle = "漂亮的天鹅" });
+            plot.Series.Add(new FunctionSeries(x => x, 0, 1, 0.1, "漂亮的天鹅"));
+            plot.Series.Add(new FunctionSeries(x => x, 0, 1, 0.1, "漂亮的天鹅\n友好的天鹅"));
+            plot.Series.Add(new FunctionSeries(x => x, 0, 1, 0.1, "漂亮的天鹅\n友好的天鹅\n尼斯天鹅"));
+
+            return plot;
+        }
+
         private class TimeSpanPoint
         {
             public TimeSpan X { get; set; }
diff --git a/Source/OxyPlot.WindowsForms/GraphicsRenderContext.cs b/Source/OxyPlot.WindowsForms/GraphicsRenderContext.cs
@@ -295,7 +295,7 @@ public override OxySize MeasureText(string text, string fontFamily, double fontS
             {
                 this.stringFormat.Alignment = StringAlignment.Near;
                 this.stringFormat.LineAlignment = StringAlignment.Near;
-                var size = this.g.MeasureString(text, font, int.MaxValue, this.stringFormat);
+                var size = Ceiling(this.g.MeasureString(text, font, int.MaxValue, this.stringFormat));
                 return new OxySize(size.Width, size.Height);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ public override OxySize MeasureText(string text, string fontFamily, double fontS`
`295`	`295`	`{`
`296`	`296`	`this.stringFormat.Alignment = StringAlignment.Near;`
`297`	`297`	`this.stringFormat.LineAlignment = StringAlignment.Near;`
`298`		`- var size = this.g.MeasureString(text, font, int.MaxValue, this.stringFormat);`
	`298`	`+ var size = Ceiling(this.g.MeasureString(text, font, int.MaxValue, this.stringFormat));`
`299`	`299`	`return new OxySize(size.Width, size.Height);`
`300`	`300`	`}`
`301`	`301`	`}`