Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 329bd00

Browse files
donokudaStanleyGoldman
donokuda
authored and
StanleyGoldman
committed
Polish up the annotations list view
1 parent 21aa934 commit 329bd00

File tree

1 file changed

+28
-51
lines changed

1 file changed

+28
-51
lines changed

‎src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestAnnotationsView.xaml‎

Lines changed: 28 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
xmlns:ghfvs="https://github.com/github/VisualStudio"
77
xmlns:local="clr-namespace:GitHub.VisualStudio.Views.GitHubPane"
88
xmlns:prop="clr-namespace:GitHub.VisualStudio.UI;assembly=GitHub.VisualStudio.UI"
9+
xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
10+
xmlns:catalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
911
xmlns:markdig="clr-namespace:Markdig.Wpf;assembly=Markdig.Wpf"
1012
mc:Ignorable="d" d:DesignHeight="500" d:DesignWidth="300">
1113

@@ -25,7 +27,7 @@
2527
</Control.Resources>
2628

2729
<ScrollViewer VerticalScrollBarVisibility="Auto">
28-
<StackPanel>
30+
<DockPanel>
2931
<StackPanel DockPanel.Dock="Top" Margin="8 0" Orientation="Vertical">
3032
<TextBlock FontSize="16" VerticalAlignment="Center">
3133
<Run FontWeight="SemiBold" Text="{Binding CheckSuiteName, Mode=OneWay}"/>
@@ -44,79 +46,54 @@
4446
TextWrapping="Wrap"/>
4547
<Rectangle Fill="{DynamicResource GitHubHeaderSeparatorBrush}" Height="1" Margin="0 4"/>
4648

47-
<ItemsControl ItemsSource="{Binding AnnotationsDictionary}">
49+
<ItemsControl Margin="-4 0" ItemsSource="{Binding AnnotationsDictionary}">
4850
<ItemsControl.ItemTemplate>
4951
<DataTemplate>
5052
<StackPanel>
5153
<Expander>
5254
<Expander.Header>
53-
<Label Content="{Binding Key}"></Label>
55+
<Label Content="{Binding Key}" FontWeight="SemiBold" ToolTip="{Binding Key}" />
5456
</Expander.Header>
5557

5658
<ItemsControl ItemsSource="{Binding Value}">
5759
<ItemsControl.ItemTemplate>
5860
<DataTemplate>
59-
<StackPanel Margin="22 0 0 0">
60-
<StackPanel Orientation="Horizontal">
61-
<ghfvs:OcticonImage Margin="0 0 0 0" MinWidth="20" Icon="search" Foreground="CornflowerBlue" Visibility="{Binding Annotation.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Notice}}"/>
62-
<ghfvs:OcticonImage Margin="0 0 0 0" MinWidth="20" Icon="alert" Foreground="#f1c647" Visibility="{Binding Annotation.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Warning}}"/>
63-
<ghfvs:OcticonImage Margin="0 0 0 0" MinWidth="20" Icon="x" Foreground="#cb2431" Visibility="{Binding Annotation.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Failure}}"/>
64-
<TextBlock FontWeight="SemiBold" Margin="2 0">
65-
<Run Text="{Binding Annotation.Title, Mode=OneWay}"/>
66-
</TextBlock>
61+
<Grid Margin="22 0 0 8" >
62+
<Grid.ColumnDefinitions>
63+
<ColumnDefinition Width="16" />
64+
<ColumnDefinition Width="*" />
65+
</Grid.ColumnDefinitions>
66+
67+
<StackPanel Grid.Column="0" VerticalAlignment="Center">
68+
<imaging:CrispImage Width="16" Height="16" Moniker="{x:Static catalog:KnownMonikers.StatusInformation}" Visibility="{Binding Annotation.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Notice}}"/>
69+
<imaging:CrispImage Width="16" Height="16" Moniker="{x:Static catalog:KnownMonikers.StatusWarning}" Visibility="{Binding Annotation.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Warning}}"/>
70+
<imaging:CrispImage Width="16" Height="16" Moniker="{x:Static catalog:KnownMonikers.StatusError}" Visibility="{Binding Annotation.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Failure}}"/>
6771
</StackPanel>
6872

69-
<StackPanel Margin="21 4 0 4">
70-
<TextBlock Margin="5 4 0 0">
71-
<Run Text="{Binding Annotation.Path, Mode=OneWay}"/>
72-
<Run FontWeight="SemiBold" Text="{Binding LineDescription, Mode=OneWay}"/>
73+
<StackPanel Margin="8,0,0,0" Grid.Column="1">
74+
<TextBlock FontFamily="Consolas" Foreground="{DynamicResource VsBrush.GrayText}" Grid.Row="0">
75+
<Run Text="Line" />
76+
<Run Text="{Binding LineDescription, Mode=OneWay}"/>
77+
</TextBlock>
78+
79+
<TextBlock FontWeight="SemiBold" Grid.Row="1">
80+
<Run Text="{Binding Annotation.Title, Mode=OneWay}"/>
7381
</TextBlock>
74-
<markdig:MarkdownViewer Margin="5 0 0 0" Markdown="{Binding Annotation.Message}"/>
82+
83+
<markdig:MarkdownViewer Grid.Column="1" Grid.Row="2"
84+
FontFamily="Consolas" Markdown="{Binding Annotation.Message}" />
7585
</StackPanel>
76-
</StackPanel>
86+
</Grid>
7787
</DataTemplate>
7888
</ItemsControl.ItemTemplate>
7989
</ItemsControl>
8090
</Expander>
8191
</StackPanel>
82-
83-
<!--
84-
<ItemsControl ItemsSource="{Binding Value}">
85-
<ItemsControl.ItemTemplate>
86-
<DataTemplate>
87-
<StackPanel>
88-
89-
<Expander Margin="0 0 4 0" Foreground="{DynamicResource GitHubVsToolWindowText}" IsExpanded="{Binding IsExpanded, Mode=OneTime}">
90-
<Expander.Header>
91-
<StackPanel Orientation="Horizontal">
92-
<ghfvs:OcticonImage Margin="0 0 0 0" MinWidth="20" Icon="search" Foreground="CornflowerBlue" Visibility="{Binding Annotation.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Notice}}"/>
93-
<ghfvs:OcticonImage Margin="0 0 0 0" MinWidth="20" Icon="alert" Foreground="#f1c647" Visibility="{Binding Annotation.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Warning}}"/>
94-
<ghfvs:OcticonImage Margin="0 0 0 0" MinWidth="20" Icon="x" Foreground="#cb2431" Visibility="{Binding Annotation.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Failure}}"/>
95-
<TextBlock FontWeight="SemiBold" Margin="2 0">
96-
<Run Text="{Binding Annotation.Title, Mode=OneWay}"/>
97-
</TextBlock>
98-
</StackPanel>
99-
</Expander.Header>
100-
<StackPanel Margin="21 4 0 4">
101-
<TextBlock Margin="5 4 0 0">
102-
<Run Text="{Binding Annotation.Path, Mode=OneWay}"/>
103-
<Run FontWeight="SemiBold" Text="{Binding LineDescription, Mode=OneWay}"/>
104-
</TextBlock>
105-
<markdig:MarkdownViewer Margin="5 0 0 0" Markdown="{Binding Annotation.Message}"/>
106-
</StackPanel>
107-
</Expander>
108-
</StackPanel>
109-
</DataTemplate>
110-
</ItemsControl.ItemTemplate>
111-
</ItemsControl>
112-
</StackPanel>
113-
-->
114-
11592
</DataTemplate>
11693
</ItemsControl.ItemTemplate>
11794
</ItemsControl>
11895
</StackPanel>
119-
</StackPanel>
96+
</DockPanel>
12097
</ScrollViewer>
12198

12299
</UserControl>

0 commit comments

Comments
 (0)