Browse Source

fixing whitespace

pull/3591/head
Jan Kučera 3 months ago
parent
commit
74f4fdba69
  1. 3
      ICSharpCode.ILSpyX/TreeView/SharpTreeNode.cs
  2. 14
      ILSpy/AssemblyTree/AssemblyTreeModel.cs
  3. 4
      ILSpy/Controls/MainToolBar.xaml.cs
  4. 2
      ILSpy/Metadata/MetadataTreeNode.cs
  5. 6
      ILSpy/NavigationState.cs
  6. 2
      ILSpy/TreeNodes/FieldTreeNode.cs
  7. 2
      ILSpy/TreeNodes/ReferenceFolderTreeNode.cs

3
ICSharpCode.ILSpyX/TreeView/SharpTreeNode.cs

@ -126,8 +126,7 @@ namespace ICSharpCode.ILSpyX.TreeView @@ -126,8 +126,7 @@ namespace ICSharpCode.ILSpyX.TreeView
get { return null; }
}
public virtual object? NavigationText
{
public virtual object? NavigationText {
get { return Text; }
}

14
ILSpy/AssemblyTree/AssemblyTreeModel.cs

@ -857,10 +857,10 @@ namespace ICSharpCode.ILSpy.AssemblyTree @@ -857,10 +857,10 @@ namespace ICSharpCode.ILSpy.AssemblyTree
{
try
{
TabPageModel tabPage = DockWorkspace.ActiveTabPage;
var currentState = tabPage.GetState();
if (currentState != null)
history.UpdateCurrent(new NavigationState(tabPage, currentState));
TabPageModel tabPage = DockWorkspace.ActiveTabPage;
var currentState = tabPage.GetState();
if (currentState != null)
history.UpdateCurrent(new NavigationState(tabPage, currentState));
NavigationState newState;
do
@ -868,8 +868,8 @@ namespace ICSharpCode.ILSpy.AssemblyTree @@ -868,8 +868,8 @@ namespace ICSharpCode.ILSpy.AssemblyTree
newState = forward ? history.GoForward() : history.GoBack();
} while (newState != null && toState != null && toState != newState);
if (newState == null)
return;
if (newState == null)
return;
navigatingToState = newState;
@ -893,7 +893,7 @@ namespace ICSharpCode.ILSpy.AssemblyTree @@ -893,7 +893,7 @@ namespace ICSharpCode.ILSpy.AssemblyTree
}
}
public NavigationState[] GetNavigateHistory(bool forward) => forward ? history.ForwardList : history.BackList;
public NavigationState[] GetNavigateHistory(bool forward) => forward ? history.ForwardList : history.BackList;
public bool CanNavigateBack => history.CanNavigateBack;

4
ILSpy/Controls/MainToolBar.xaml.cs

@ -117,7 +117,7 @@ namespace ICSharpCode.ILSpy.Controls @@ -117,7 +117,7 @@ namespace ICSharpCode.ILSpy.Controls
var dropDownPanel = new StackPanel { Orientation = Orientation.Horizontal };
var contextMenu = new ContextMenu {
var contextMenu = new ContextMenu {
PlacementTarget = dropDownPanel,
Tag = command
};
@ -144,7 +144,7 @@ namespace ICSharpCode.ILSpy.Controls @@ -144,7 +144,7 @@ namespace ICSharpCode.ILSpy.Controls
BindingOperations.SetBinding(dropDownToggle, ToggleButton.IsCheckedProperty,
new Binding(nameof(contextMenu.IsOpen)) { Source = contextMenu });
BindingOperations.SetBinding(dropDownToggle, IsEnabledProperty,
BindingOperations.SetBinding(dropDownToggle, IsEnabledProperty,
new Binding(nameof(IsEnabled)) { Source = toolbarItem });
dropDownPanel.Children.Add(toolbarItem);

2
ILSpy/Metadata/MetadataTreeNode.cs

@ -46,7 +46,7 @@ namespace ICSharpCode.ILSpy.Metadata @@ -46,7 +46,7 @@ namespace ICSharpCode.ILSpy.Metadata
public override object Text => title;
public override object NavigationText => metadataFile.Name + " " + Text;
public override object Icon => Images.Metadata;
public override bool View(TabPageModel tabPage)

6
ILSpy/NavigationState.cs

@ -64,10 +64,8 @@ namespace ICSharpCode.ILSpy @@ -64,10 +64,8 @@ namespace ICSharpCode.ILSpy
return this.ViewState.Equals(other.ViewState);
}
public object NavigationText
{
get
{
public object NavigationText {
get {
if (this.treeNodes.Count == 1)
return this.treeNodes.First();

2
ILSpy/TreeNodes/FieldTreeNode.cs

@ -41,7 +41,7 @@ namespace ICSharpCode.ILSpy.TreeNodes @@ -41,7 +41,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
public override object Text => GetText(GetFieldDefinition(), Language) + GetSuffixString(FieldDefinition);
public override object NavigationText => GetText(GetFieldDefinition(), Language, includeDeclaringTypeName: true);
public override object NavigationText => GetText(GetFieldDefinition(), Language, includeDeclaringTypeName: true);
private IField GetFieldDefinition()
{

2
ILSpy/TreeNodes/ReferenceFolderTreeNode.cs

@ -45,7 +45,7 @@ namespace ICSharpCode.ILSpy.TreeNodes @@ -45,7 +45,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
public override object Text => Resources.References;
public override object NavigationText => module.Name + " " + Text;
public override object Icon => Images.ReferenceFolder;
protected override void LoadChildren()

Loading…
Cancel
Save