Browse Source

Limit size of tooltips to MainWindow size.

pull/1654/head
Siegfried Pammer 7 years ago
parent
commit
6d36627647
  1. 8
      ILSpy/TextView/DecompilerTextView.cs
  2. 2
      ILSpy/TextView/XmlDocRenderer.cs

8
ILSpy/TextView/DecompilerTextView.cs

@ -394,7 +394,11 @@ namespace ICSharpCode.ILSpy.TextView
public FlowDocumentTooltip(FlowDocument document) public FlowDocumentTooltip(FlowDocument document)
{ {
TextOptions.SetTextFormattingMode(this, TextFormattingMode.Display); TextOptions.SetTextFormattingMode(this, TextFormattingMode.Display);
viewer = new FlowDocumentScrollViewer() { Width = document.MinPageWidth + 100 }; double fontSize = DisplaySettingsPanel.CurrentDisplaySettings.SelectedFontSize;
viewer = new FlowDocumentScrollViewer() {
Width = document.MinPageWidth + fontSize * 5,
MaxWidth = MainWindow.Instance.ActualWidth
};
viewer.Document = document; viewer.Document = document;
Border border = new Border { Border border = new Border {
Background = SystemColors.ControlBrush, Background = SystemColors.ControlBrush,
@ -405,7 +409,7 @@ namespace ICSharpCode.ILSpy.TextView
}; };
this.Child = border; this.Child = border;
viewer.Foreground = SystemColors.InfoTextBrush; viewer.Foreground = SystemColors.InfoTextBrush;
document.FontSize = DisplaySettingsPanel.CurrentDisplaySettings.SelectedFontSize; document.FontSize = fontSize;
} }
public bool CloseWhenMouseMovesAway { public bool CloseWhenMouseMovesAway {

2
ILSpy/TextView/XmlDocRenderer.cs

@ -119,7 +119,7 @@ namespace ICSharpCode.ILSpy.TextView
}; };
text.Inlines.AddRange(richText.CreateRuns(document)); text.Inlines.AddRange(richText.CreateRuns(document));
text.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity)); text.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
this.document.MinPageWidth = text.DesiredSize.Width; this.document.MinPageWidth = Math.Min(text.DesiredSize.Width, MainWindow.Instance.ActualWidth);
block.Inlines.AddRange(richText.CreateRuns(document)); block.Inlines.AddRange(richText.CreateRuns(document));
block.FontFamily = GetCodeFont(); block.FontFamily = GetCodeFont();
block.TextAlignment = TextAlignment.Left; block.TextAlignment = TextAlignment.Left;

Loading…
Cancel
Save