Wpf Border

PeterForstmeier · PeterForstmeier · commit c7c43444598d · 2015-10-18T18:49:54.000+02:00
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataManager/Listhandling/CollectionDataSource.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataManager/Listhandling/CollectionDataSource.cs
@@ -198,7 +198,7 @@ string ReadValueFromProperty (string columnName) {
 				var val = propertyPath.Evaluate(Current);
 					return val.ToString();
 			} catch (Exception e) {
-				Console.WriteLine(" Cant' find <{0}",columnName);
+				Console.WriteLine(" Cant' find <{0}>",columnName);
 //				throw e;
 			}
 			return String.Empty;
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/WpfVisitor.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/WpfVisitor.cs
@@ -176,13 +176,17 @@ static BitmapSource ToBitmapSource(System.Drawing.Image source){
 
 		
 		public override void Visit(ExportRectangle exportRectangle){
-			Canvas  containerCanvas  = FixedDocumentCreator.CreateContainer(exportRectangle);
-			Canvas elementCanvas = null;
+			
+			var  containerCanvas  = FixedDocumentCreator.CreateContainer(exportRectangle);
+			// leads to a small gap from Border to canvas
+			containerCanvas.Width = containerCanvas.Width - ( 3 * exportRectangle.Thickness);
+			containerCanvas.Height = containerCanvas.Height - (3 * exportRectangle.Thickness);
+			
 			var border = CreateBorder(exportRectangle);
 			border.CornerRadius = new CornerRadius(Convert.ToDouble(exportRectangle.CornerRadius));
-			
 			CanvasHelper.SetPosition(border, new Point(0,0));
 			
+			Canvas elementCanvas = null;
 			foreach (var element in exportRectangle.ExportedItems) {
 				if (IsGraphicsContainer(element)) {
 					elementCanvas = RenderGraphicsContainer(element);
@@ -253,8 +257,8 @@ static Border CreateBorder(IExportColumn exportColumn){
 			border.BorderThickness =  Thickness(exportColumn);
 			border.BorderBrush = FixedDocumentCreator.ConvertBrush(exportColumn.ForeColor);
 			border.Background = FixedDocumentCreator.ConvertBrush(exportColumn.BackColor);
-			border.Width = exportColumn.Size.Width + 2;
-			border.Height = exportColumn.Size.Height + 2;
+			border.Width = exportColumn.Size.Width;
+			border.Height = exportColumn.Size.Height;
 			return border;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ string ReadValueFromProperty (string columnName) {`
`198`	`198`	`var val = propertyPath.Evaluate(Current);`
`199`	`199`	`return val.ToString();`
`200`	`200`	`} catch (Exception e) {`
`201`		`- Console.WriteLine(" Cant' find <{0}",columnName);`
	`201`	`+ Console.WriteLine(" Cant' find <{0}>",columnName);`
`202`	`202`	`// throw e;`
`203`	`203`	`}`
`204`	`204`	`return String.Empty;`