From c7c43444598d71e1172b91150866772d8ef706fc Mon Sep 17 00:00:00 2001 From: Peter Forstmeier Date: Sun, 18 Oct 2015 18:49:54 +0200 Subject: [PATCH] Wpf Border --- .../Listhandling/CollectionDataSource.cs | 2 +- .../Src/Wpf/Visitor/WpfVisitor.cs | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) 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 index 3e4cceafd6..467fd68f8a 100644 --- 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 @@ namespace ICSharpCode.Reporting.DataManager.Listhandling 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 index ab430c112f..9570791c50 100644 --- 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 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor 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 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor 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; }