Browse Source

Bugfixes.

pull/1/head
Daniel Grunwald 15 years ago
parent
commit
93826f5e3c
  1. 1
      ICSharpCode.Decompiler/GraphVizGraph.cs
  2. 4
      ILSpy/FilterSettings.cs
  3. 2
      ILSpy/MainWindow.xaml.cs
  4. 2
      ILSpy/TypeTreeNode.cs

1
ICSharpCode.Decompiler/GraphVizGraph.cs

@ -93,6 +93,7 @@ namespace ICSharpCode.Decompiler
public void Save(TextWriter writer) public void Save(TextWriter writer)
{ {
writer.WriteLine("digraph G {"); writer.WriteLine("digraph G {");
writer.WriteLine("node [fontsize = 14.5];");
WriteGraphAttribute(writer, "rankdir", rankdir); WriteGraphAttribute(writer, "rankdir", rankdir);
foreach (GraphVizNode node in nodes) { foreach (GraphVizNode node in nodes) {
node.Save(writer); node.Save(writer);

4
ILSpy/FilterSettings.cs

@ -45,12 +45,12 @@ namespace ICSharpCode.ILSpy
public bool SearchTermMatches(string text) public bool SearchTermMatches(string text)
{ {
if (searchTerm == null) if (string.IsNullOrEmpty(searchTerm))
return true; return true;
return text.IndexOf(searchTerm, StringComparison.OrdinalIgnoreCase) >= 0; return text.IndexOf(searchTerm, StringComparison.OrdinalIgnoreCase) >= 0;
} }
bool showInternalApi; bool showInternalApi = true;
public bool ShowInternalApi { public bool ShowInternalApi {
get { return showInternalApi; } get { return showInternalApi; }

2
ILSpy/MainWindow.xaml.cs

@ -138,6 +138,8 @@ namespace ICSharpCode.ILSpy
void ShowGraph(string name, GraphVizGraph graph) void ShowGraph(string name, GraphVizGraph graph)
{ {
foreach (char c in Path.GetInvalidFileNameChars())
name = name.Replace(c, '-');
string fileName = Path.Combine(Path.GetTempPath(), name); string fileName = Path.Combine(Path.GetTempPath(), name);
graph.Save(fileName + ".gv"); graph.Save(fileName + ".gv");
Process.Start("dot", "\"" + fileName + ".gv\" -Tpng -o \"" + fileName + ".png\"").WaitForExit(); Process.Start("dot", "\"" + fileName + ".gv\" -Tpng -o \"" + fileName + ".png\"").WaitForExit();

2
ILSpy/TypeTreeNode.cs

@ -79,7 +79,7 @@ namespace ICSharpCode.ILSpy
public override FilterResult Filter(FilterSettings settings) public override FilterResult Filter(FilterSettings settings)
{ {
if (settings.ShowInternalApi == false && IsPublicAPI) if (!settings.ShowInternalApi && !IsPublicAPI)
return FilterResult.Hidden; return FilterResult.Hidden;
if (settings.SearchTermMatches(type.Name)) if (settings.SearchTermMatches(type.Name))
return FilterResult.Match; return FilterResult.Match;

Loading…
Cancel
Save