Browse Source

TextFormatter

pull/725/merge
Peter Forstmeier 10 years ago
parent
commit
a0acf059ef
  1. 11
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/FixedDocumentCreator.cs
  2. 10
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/WpfVisitor.cs

11
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/FixedDocumentCreator.cs

@ -75,15 +75,16 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor @@ -75,15 +75,16 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor
formattedText.MaxTextWidth = exportText.DesiredSize.Width ;
formattedText.TextAlignment = exportText.TextAlignment;
// var s = formattedText.Height;
if (!exportText.CanGrow) {
formattedText.MaxTextHeight = exportText.Size.Height;
} else {
formattedText.MaxTextHeight = ExtensionMethodes.ToPoints(exportText.DesiredSize.Height );
}
}
//
// else {
//// formattedText.MaxTextHeight = ExtensionMethodes.ToPoints(exportText.DesiredSize.Height );
// }
ApplyPrintStyles(formattedText,exportText);
return formattedText;
}

10
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/WpfVisitor.cs

@ -118,15 +118,17 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor @@ -118,15 +118,17 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor
// http://stackoverflow.com/questions/25308612/vertical-alignment-with-drawingcontext-drawtext
public override void Visit(ExportText exportColumn){
if (exportColumn.Text.Equals("BaseTextItem2147483637")) {
Console.WriteLine("stop");
}
var formattedText = FixedDocumentCreator.CreateFormattedText((ExportText)exportColumn);
var location = new Point(exportColumn.Location.X,exportColumn.Location.Y);
var visual = new DrawingVisual();
using (var drawingContext = visual.RenderOpen()){
var bachgroundRect = new Rect(location,new Size(exportColumn.DesiredSize.Width,formattedText.MaxTextHeight));
// var bachgroundRect = new Rect(location,new Size(exportColumn.DesiredSize.Width,formattedText.Height));
if (ShouldSetBackcolor(exportColumn)) {
var bachgroundRect = new Rect(location,new Size(exportColumn.DesiredSize.Width,formattedText.Height));
drawingContext.DrawRectangle(FixedDocumentCreator.ConvertBrush(exportColumn.BackColor), null,bachgroundRect);
}

Loading…
Cancel
Save