Browse Source

Wpf Border

pull/716/head
Peter Forstmeier 10 years ago
parent
commit
c7c4344459
  1. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataManager/Listhandling/CollectionDataSource.cs
  2. 14
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/WpfVisitor.cs

2
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); var val = propertyPath.Evaluate(Current);
return val.ToString(); return val.ToString();
} catch (Exception e) { } catch (Exception e) {
Console.WriteLine(" Cant' find <{0}",columnName); Console.WriteLine(" Cant' find <{0}>",columnName);
// throw e; // throw e;
} }
return String.Empty; return String.Empty;

14
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){ 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); var border = CreateBorder(exportRectangle);
border.CornerRadius = new CornerRadius(Convert.ToDouble(exportRectangle.CornerRadius)); border.CornerRadius = new CornerRadius(Convert.ToDouble(exportRectangle.CornerRadius));
CanvasHelper.SetPosition(border, new Point(0,0)); CanvasHelper.SetPosition(border, new Point(0,0));
Canvas elementCanvas = null;
foreach (var element in exportRectangle.ExportedItems) { foreach (var element in exportRectangle.ExportedItems) {
if (IsGraphicsContainer(element)) { if (IsGraphicsContainer(element)) {
elementCanvas = RenderGraphicsContainer(element); elementCanvas = RenderGraphicsContainer(element);
@ -253,8 +257,8 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor
border.BorderThickness = Thickness(exportColumn); border.BorderThickness = Thickness(exportColumn);
border.BorderBrush = FixedDocumentCreator.ConvertBrush(exportColumn.ForeColor); border.BorderBrush = FixedDocumentCreator.ConvertBrush(exportColumn.ForeColor);
border.Background = FixedDocumentCreator.ConvertBrush(exportColumn.BackColor); border.Background = FixedDocumentCreator.ConvertBrush(exportColumn.BackColor);
border.Width = exportColumn.Size.Width + 2; border.Width = exportColumn.Size.Width;
border.Height = exportColumn.Size.Height + 2; border.Height = exportColumn.Size.Height;
return border; return border;
} }

Loading…
Cancel
Save