Skip to content

Added TextBlock with assembly path in tab comparison #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
salem84 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added TextBlock with assembly path in tab comparison #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 27 additions & 23 deletions UI/JustAssembly/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,36 +227,40 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>

<localViews:CodeViewer Grid.Column="1"
SyntaxHighlighting="C#"
IsReadOnly="True"
SourceCode="{Binding LeftSourceCode}"
BackgroundRenderer="{Binding LeftSourceCode.BackgroundRenderer}"
ShowLineNumbers="True"
VerticalOffset="{Binding VerticalOffset, Mode=TwoWay}"
VerticalScrollBarVisibility="Hidden"
HorizontalOffsetPercent="{Binding HorizontalOffsetPercent, Mode=TwoWay}"
VisibleLines ="{Binding VisibleLines, Mode=TwoWay}"
ScrollingLimit="{Binding ScrollingLimit, Mode=TwoWay}"
FontSize="{Binding FontSize, Mode=TwoWay}" />
<StackPanel Grid.Column="1">
<TextBlock Text="{Binding LeftSourceCode.AssemblyPath}" Background="#EFEFEF" Margin="15,5,0,0" FontStyle="Italic"/>
Copy link
Contributor

@atdimitrov atdimitrov Jan 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The design part looks a bit strange and asymmetrical. I would suggest replacing the margin with Padding="5". It should look a lot cleaner.

<localViews:CodeViewer SyntaxHighlighting="C#"
IsReadOnly="True"
SourceCode="{Binding LeftSourceCode}"
BackgroundRenderer="{Binding LeftSourceCode.BackgroundRenderer}"
ShowLineNumbers="True"
VerticalOffset="{Binding VerticalOffset, Mode=TwoWay}"
VerticalScrollBarVisibility="Hidden"
HorizontalOffsetPercent="{Binding HorizontalOffsetPercent, Mode=TwoWay}"
VisibleLines ="{Binding VisibleLines, Mode=TwoWay}"
ScrollingLimit="{Binding ScrollingLimit, Mode=TwoWay}"
FontSize="{Binding FontSize, Mode=TwoWay}" />
</StackPanel>

<GridSplitter Grid.Column="2"
Width="6"
HorizontalAlignment="Center"
VerticalAlignment="Stretch" />

<localViews:CodeViewer Grid.Column="3"
SyntaxHighlighting="C#"
IsReadOnly="True"
SourceCode="{Binding RightSourceCode}"
BackgroundRenderer="{Binding RightSourceCode.BackgroundRenderer}"
ShowLineNumbers="True"
VerticalOffset="{Binding VerticalOffset, Mode=TwoWay}"
HorizontalOffsetPercent="{Binding HorizontalOffsetPercent, Mode=TwoWay}"
VisibleLines ="{Binding VisibleLines, Mode=TwoWay}"
ScrollingLimit="{Binding ScrollingLimit, Mode=TwoWay}"
FontSize="{Binding FontSize, Mode=TwoWay}" />
<StackPanel Grid.Column="3">
<TextBlock Text="{Binding RightSourceCode.AssemblyPath}" Background="#EFEFEF" Margin="15,5,0,0" FontStyle="Italic"/>
<localViews:CodeViewer SyntaxHighlighting="C#"
IsReadOnly="True"
SourceCode="{Binding RightSourceCode}"
BackgroundRenderer="{Binding RightSourceCode.BackgroundRenderer}"
ShowLineNumbers="True"
VerticalOffset="{Binding VerticalOffset, Mode=TwoWay}"
HorizontalOffsetPercent="{Binding HorizontalOffsetPercent, Mode=TwoWay}"
VisibleLines ="{Binding VisibleLines, Mode=TwoWay}"
ScrollingLimit="{Binding ScrollingLimit, Mode=TwoWay}"
FontSize="{Binding FontSize, Mode=TwoWay}" />

</StackPanel>
<localViews:SideSummary Grid.Column="0"
LeftSourceCode="{Binding LeftSourceCode}"
RightSourceCode="{Binding RightSourceCode}"
Expand Down
8 changes: 8 additions & 0 deletions UI/JustAssembly/Infrastructure/CodeViewer/DecompiledSourceCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,14 @@ public bool HighlighMember
}
}

public string AssemblyPath
{
get
{
return memberMetadata?.AssemblyPath;
}
}

public override string ToString()
{
return sourceCode;
Expand Down