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

Commit 0708f8d

Browse files
StanleyGoldmanStanleyGoldman
authored
Merge pull request #2018 from github/donokuda/check-suite-polish
Style inline annotations
2 parents 2030133 + c06767e commit 0708f8d

File tree

3 files changed

+143
-92
lines changed

3 files changed

+143
-92
lines changed

‎src/GitHub.VisualStudio.UI/Views/CommentThreadView.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<sampleData:CommentThreadViewModelDesigner />
1111
</d:DesignProperties.DataContext>
1212

13-
<StackPanel Orientation="Vertical">
13+
<StackPanel Orientation="Vertical" Margin="0 0 0 4">
1414
<ItemsControl ItemsSource="{Binding Annotations}">
1515
<ItemsControl.ItemTemplate>
1616
<DataTemplate>
@@ -22,7 +22,7 @@
2222
<ItemsControl ItemsSource="{Binding Comments}">
2323
<ItemsControl.ItemTemplate>
2424
<DataTemplate>
25-
<local:CommentView Margin="0 4"/>
25+
<local:CommentView Margin="0"/>
2626
</DataTemplate>
2727
</ItemsControl.ItemTemplate>
2828
</ItemsControl>

‎src/GitHub.VisualStudio.UI/Views/CommentView.xaml‎

Lines changed: 86 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -37,80 +37,97 @@
3737

3838
<Grid>
3939
<!-- Displays an existing comment-->
40-
<StackPanel Orientation="Vertical" Margin="4">
41-
<StackPanel.Style>
42-
<Style TargetType="FrameworkElement">
43-
<Setter Property="Visibility" Value="Collapsed"/>
44-
<Style.Triggers>
45-
<DataTrigger Binding="{Binding EditState}" Value="None">
46-
<Setter Property="Visibility" Value="Visible"/>
47-
</DataTrigger>
48-
</Style.Triggers>
49-
</Style>
50-
</StackPanel.Style>
51-
52-
<DockPanel>
53-
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left" >
54-
<controls:AccountAvatar Width="16"
55-
Height="16"
56-
Account="{Binding Author}"/>
57-
58-
<TextBlock Foreground="{DynamicResource GitHubVsToolWindowText}" FontWeight="Bold" Text="{Binding Author.Login}" Margin="4 0"/>
59-
<ui:GitHubActionLink Content="{Binding CreatedAt, Converter={ui:DurationToStringConverter}}"
60-
Command="{Binding OpenOnGitHub}"
61-
Foreground="{DynamicResource GitHubVsToolWindowText}"
62-
Opacity="0.75" />
63-
<Border Background="{DynamicResource VsBrush.InfoBackground}"
64-
BorderBrush="{DynamicResource VsBrush.AccentPale}"
65-
BorderThickness="1"
66-
CornerRadius="3"
67-
Padding="2 1"
68-
Visibility="{Binding IsPending, Converter={ui:BooleanToVisibilityConverter}, FallbackValue=Collapsed}">
69-
<TextBlock FontSize="10" Text="{x:Static ghfvs:Resources.Pending}" />
70-
</Border>
71-
</StackPanel>
72-
73-
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" DockPanel.Dock="Right"
74-
Visibility="{Binding CanDelete, Converter={ui:BooleanToVisibilityConverter}}">
75-
<ui:OcticonButton Command="{Binding BeginEdit}"
76-
Height="16"
77-
Width="20"
78-
Margin="0 0 4 0"
79-
Background="Transparent"
80-
Foreground="{DynamicResource GitHubVsToolWindowText}"
81-
Icon="pencil"/>
82-
<ui:OcticonButton Command="{Binding Delete}"
83-
Width="16"
84-
Height="16"
85-
Margin="0"
86-
Background="Transparent"
87-
Foreground="{DynamicResource GitHubVsToolWindowText}"
88-
Icon="x"/>
89-
</StackPanel>
90-
</DockPanel>
91-
92-
<markdig:MarkdownViewer Grid.Column="1" Grid.Row="1"
93-
Margin="0 2 0 0"
94-
Foreground="{DynamicResource VsBrush.WindowText}"
95-
Markdown="{Binding Body}"/>
96-
97-
<DockPanel Grid.Column="1" Grid.Row="2"
98-
Margin="0 4"
99-
HorizontalAlignment="Left"
100-
TextBlock.Foreground="Red">
101-
<DockPanel.Style>
40+
<Border BorderBrush="{DynamicResource VsBrush.ScrollBarThumbBackground}" BorderThickness="0 1 0 0" HorizontalAlignment="Stretch">
41+
<Grid Background="{DynamicResource VsBrush.ToolWindowBackground}">
42+
<Grid.ColumnDefinitions>
43+
<ColumnDefinition Width="4" />
44+
<ColumnDefinition Width="*" />
45+
</Grid.ColumnDefinitions>
46+
47+
<Grid.RowDefinitions>
48+
<RowDefinition Height="Auto" />
49+
</Grid.RowDefinitions>
50+
51+
<Grid.Style>
10252
<Style TargetType="FrameworkElement">
53+
<Setter Property="Visibility" Value="Collapsed"/>
10354
<Style.Triggers>
104-
<DataTrigger Binding="{Binding ErrorMessage}" Value="{x:Null}">
105-
<Setter Property="Visibility" Value="Collapsed"/>
55+
<DataTrigger Binding="{Binding EditState}" Value="None">
56+
<Setter Property="Visibility" Value="Visible"/>
10657
</DataTrigger>
10758
</Style.Triggers>
10859
</Style>
109-
</DockPanel.Style>
110-
<ui:OcticonImage DockPanel.Dock="Left" Icon="alert" Margin="0 0 4 0"/>
111-
<TextBlock Text="{Binding ErrorMessage}" TextWrapping="Wrap"/>
112-
</DockPanel>
113-
</StackPanel>
60+
</Grid.Style>
61+
62+
<StackPanel Background="#82909e" Grid.Row="0" Grid.Column="0" Grid.RowSpan="5" Visibility="{Binding Model.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Notice}}" />
63+
64+
<Border Grid.Column="1" Padding="8">
65+
<StackPanel>
66+
<DockPanel>
67+
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left" >
68+
<controls:AccountAvatar Width="16"
69+
Height="16"
70+
Account="{Binding Author}"/>
71+
72+
<TextBlock Foreground="{DynamicResource GitHubVsToolWindowText}" FontWeight="SemiBold" Text="{Binding Author.Login}" Margin="4 0"/>
73+
<ui:GitHubActionLink Content="{Binding CreatedAt, Converter={ui:DurationToStringConverter}}"
74+
Command="{Binding OpenOnGitHub}"
75+
Foreground="{DynamicResource GitHubVsToolWindowText}"
76+
Opacity="0.75" />
77+
<Border Background="{DynamicResource VsBrush.InfoBackground}"
78+
BorderBrush="{DynamicResource VsBrush.AccentPale}"
79+
BorderThickness="1"
80+
CornerRadius="3"
81+
Padding="2 1"
82+
Visibility="{Binding IsPending, Converter={ui:BooleanToVisibilityConverter}, FallbackValue=Collapsed}">
83+
<TextBlock FontSize="10" Text="{x:Static ghfvs:Resources.Pending}" />
84+
</Border>
85+
</StackPanel>
86+
87+
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" DockPanel.Dock="Right"
88+
Visibility="{Binding CanDelete, Converter={ui:BooleanToVisibilityConverter}}">
89+
<ui:OcticonButton Command="{Binding BeginEdit}"
90+
Height="16"
91+
Width="20"
92+
Margin="0 0 4 0"
93+
Background="Transparent"
94+
Foreground="{DynamicResource GitHubVsToolWindowText}"
95+
Icon="pencil"/>
96+
<ui:OcticonButton Command="{Binding Delete}"
97+
Width="16"
98+
Height="16"
99+
Margin="0"
100+
Background="Transparent"
101+
Foreground="{DynamicResource GitHubVsToolWindowText}"
102+
Icon="x"/>
103+
</StackPanel>
104+
</DockPanel>
105+
106+
<markdig:MarkdownViewer Grid.Column="1" Grid.Row="1"
107+
Margin="20 2 0 0"
108+
Foreground="{DynamicResource VsBrush.WindowText}"
109+
Markdown="{Binding Body}"/>
110+
111+
<DockPanel Grid.Column="1" Grid.Row="2"
112+
Margin="0 4"
113+
HorizontalAlignment="Left"
114+
TextBlock.Foreground="Red">
115+
<DockPanel.Style>
116+
<Style TargetType="FrameworkElement">
117+
<Style.Triggers>
118+
<DataTrigger Binding="{Binding ErrorMessage}" Value="{x:Null}">
119+
<Setter Property="Visibility" Value="Collapsed"/>
120+
</DataTrigger>
121+
</Style.Triggers>
122+
</Style>
123+
</DockPanel.Style>
124+
<ui:OcticonImage DockPanel.Dock="Left" Icon="alert" Margin="0 0 4 0"/>
125+
<TextBlock Text="{Binding ErrorMessage}" TextWrapping="Wrap"/>
126+
</DockPanel>
127+
</StackPanel>
128+
</Border>
129+
</Grid>
130+
</Border>
114131

115132
<!-- Displays edit view or a reply placeholder-->
116133
<Grid>

‎src/GitHub.VisualStudio.UI/Views/InlineAnnotationView.xaml‎

Lines changed: 55 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,68 @@
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:ghfvs="https://github.com/github/VisualStudio"
7+
xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
8+
xmlns:catalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
79
xmlns:markdig="clr-namespace:Markdig.Wpf;assembly=Markdig.Wpf"
810
mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300">
911

1012
<d:DesignProperties.DataContext>
1113
<ghfvs:InlineAnnotationViewModelDesigner />
1214
</d:DesignProperties.DataContext>
1315

14-
<StackPanel Orientation="Vertical">
15-
<StackPanel Orientation="Horizontal">
16-
<ghfvs:OcticonImage Margin="0 0 0 0" MinWidth="20" Icon="search" Foreground="CornflowerBlue" Visibility="{Binding Model.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Notice}}"/>
17-
<ghfvs:OcticonImage Margin="0 0 0 0" MinWidth="20" Icon="alert" Foreground="#f1c647" Visibility="{Binding Model.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Warning}}"/>
18-
<ghfvs:OcticonImage Margin="0 0 0 0" MinWidth="20" Icon="x" Foreground="#cb2431" Visibility="{Binding Model.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Failure}}"/>
19-
</StackPanel>
20-
<TextBlock FontWeight="SemiBold" Margin="2 0">
21-
<Run Text="{Binding Model.CheckSuiteName, Mode=OneWay}"/>
22-
</TextBlock>
23-
<TextBlock FontWeight="SemiBold" Margin="2 0">
24-
<Run Text="{Binding Model.CheckRunName, Mode=OneWay}"/>
25-
</TextBlock>
26-
<TextBlock FontWeight="SemiBold" Margin="2 0">
27-
<Run Text="{Binding Model.Title, Mode=OneWay}"/>
28-
</TextBlock>
29-
<TextBlock Margin="5 4 0 0">
30-
<Run Text="{Binding Model.Path, Mode=OneWay}"/>
31-
<Run FontWeight="SemiBold" Text="{Binding Model.LineDescription, Mode=OneWay}"/>
32-
</TextBlock>
33-
<markdig:MarkdownViewer Margin="5 0 0 0" Markdown="{Binding Model.Message}"/>
34-
</StackPanel>
16+
<Border BorderBrush="{DynamicResource VsBrush.ScrollBarThumbBackground}" BorderThickness="0 0 0 1" HorizontalAlignment="Stretch" Margin="0 0 0 4">
17+
<Grid Background="{DynamicResource VsBrush.ToolWindowBackground}" HorizontalAlignment="Stretch">
18+
<Grid.ColumnDefinitions>
19+
<ColumnDefinition Width="4" />
20+
<ColumnDefinition Width="*" />
21+
</Grid.ColumnDefinitions>
3522

23+
<Grid.RowDefinitions>
24+
<RowDefinition Height="Auto" />
25+
</Grid.RowDefinitions>
26+
27+
<StackPanel Background="#23a1d0" Grid.Row="0" Grid.Column="0" Grid.RowSpan="5" Visibility="{Binding Model.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Notice}}" />
28+
<StackPanel Background="#f8d45c" Grid.Row="0" Grid.Column="0" Grid.RowSpan="5" Visibility="{Binding Model.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Warning}}"/>
29+
<StackPanel Background="#cc180e" Grid.Row="0" Grid.Column="0" Grid.RowSpan="5" Visibility="{Binding Model.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Failure}}"/>
30+
31+
<Border Grid.Column="1" Padding="8">
32+
<Grid>
33+
<Grid.ColumnDefinitions>
34+
<ColumnDefinition Width="Auto" />
35+
<ColumnDefinition Width="*" />
36+
</Grid.ColumnDefinitions>
37+
38+
<Grid.RowDefinitions>
39+
<RowDefinition Height="Auto" />
40+
<RowDefinition Height="Auto" />
41+
<RowDefinition Height="Auto" />
42+
<RowDefinition Height="Auto" />
43+
</Grid.RowDefinitions>
44+
45+
<StackPanel Grid.Column="0" Grid.Row="0" Background="Transparent" VerticalAlignment="Center">
46+
<imaging:CrispImage Width="16" Height="16" Moniker="{x:Static catalog:KnownMonikers.StatusInformation}" Visibility="{Binding Model.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Notice}}"/>
47+
<imaging:CrispImage Width="16" Height="16" Moniker="{x:Static catalog:KnownMonikers.StatusWarning}" Visibility="{Binding Model.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Warning}}"/>
48+
<imaging:CrispImage Width="16" Height="16" Moniker="{x:Static catalog:KnownMonikers.StatusError}" Visibility="{Binding Model.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Failure}}"/>
49+
</StackPanel>
50+
51+
<TextBlock Grid.Column="1" Grid.Row="0" Margin="4 0 0 0" Foreground="{DynamicResource VsBrush.ToolWindowText}">
52+
<Run FontWeight="SemiBold" Text="{Binding Model.Path, Mode=OneWay}"/>
53+
</TextBlock>
54+
55+
<TextBlock Grid.Column="1" Grid.Row="1" FontSize="14" Margin="4 8 0 8" Foreground="{DynamicResource VsBrush.ToolWindowText}">
56+
<Run FontWeight="SemiBold" Text="{Binding Model.CheckSuiteName, Mode=OneWay}"/>
57+
<Run Text="/"/>
58+
<Run Text="{Binding Model.CheckRunName, Mode=OneWay}"/>
59+
</TextBlock>
60+
61+
<TextBlock Grid.Column="1" Grid.Row="2" FontWeight="SemiBold" Margin="4 0 0 8" Foreground="{DynamicResource VsBrush.ToolWindowText}">
62+
<Run Text="{Binding Model.Title, Mode=OneWay}"/>
63+
</TextBlock>
64+
65+
<TextBlock HorizontalAlignment="Stretch" TextWrapping="Wrap" Grid.Column="1" Grid.Row="3" Margin="4 0 0 0" FontFamily="Consolas" FontSize="12" Text="{Binding Model.Message}" Foreground="{DynamicResource VsBrush.ToolWindowText}" />
66+
</Grid>
67+
</Border>
68+
</Grid>
69+
</Border>
3670
</UserControl>
3771

0 commit comments

Comments
 (0)