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

Commit d738496

Browse files
Merge pull request #2074 from github/donokuda/update-check-icon
WIP: Prefer text instead of icon in checks list
2 parents 04e6fc7 + c07100a commit d738496

File tree

2 files changed

+16
-21
lines changed

2 files changed

+16
-21
lines changed

src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCheckView.xaml

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@
2424

2525
<Grid>
2626
<Grid.ColumnDefinitions>
27-
<ColumnDefinition Width="Auto" SharedSizeGroup="ColumnZero" />
28-
<ColumnDefinition Width="*" SharedSizeGroup="ColumnOne" />
29-
<ColumnDefinition Width="Auto" SharedSizeGroup="ColumnTwo" />
27+
<ColumnDefinition Width="Auto"/>
3028
<ColumnDefinition Width="*"/>
31-
<ColumnDefinition Width="Auto" SharedSizeGroup="ColumnFour" />
32-
<ColumnDefinition MinWidth="50" Width="Auto" SharedSizeGroup="ColumnFive" />
29+
<ColumnDefinition Width="Auto"/>
30+
<ColumnDefinition Width="Auto"/>
3331
</Grid.ColumnDefinitions>
3432

3533
<Grid.RowDefinitions>
@@ -40,22 +38,19 @@
4038
<ghfvs:OcticonImage Grid.Column="0" Margin="0 0 4 0" Icon="x" Foreground="#cb2431" Visibility="{Binding Status, Converter={ghfvs:EqualsToVisibilityConverter Failure}}"/>
4139
<ghfvs:OcticonImage Grid.Column="0" Margin="0 0 4 0" Icon="primitive_dot" Foreground="#f1c647" Visibility="{Binding Status, Converter={ghfvs:EqualsToVisibilityConverter Pending}}"/>
4240

43-
<!--
44-
<Image Grid.Column="1" Source="{Binding AvatarUrl}" Height="16" Width="16" />
45-
-->
46-
47-
<Label Grid.Column="2" Foreground="{DynamicResource VsBrush.WindowText}" Content="{Binding Title}"/>
48-
<!--
49-
<Label Grid.Column="3" HorizontalAlignment="Right" Content="{Binding Description}" ToolTip="{Binding Description}" />
50-
-->
51-
<Label Grid.Column="3" HorizontalAlignment="Right">
52-
<ghfvs:OcticonButton Command="{Binding Path=DataContext.ShowAnnotations, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type local:PullRequestDetailView}}}"
53-
CommandParameter="{Binding}"
54-
Visibility="{Binding HasAnnotations, Converter={ghfvs:BooleanToVisibilityConverter}}"
55-
Margin="0 0 0 0" Icon="file_code" Foreground="Black" />
41+
<Label Grid.Column="1" Foreground="{DynamicResource VsBrush.WindowText}">
42+
<TextBlock TextTrimming="CharacterEllipsis" Text="{Binding Title}" />
5643
</Label>
57-
<Label Grid.Column="4" HorizontalAlignment="Right"
58-
Visibility="{Binding DetailsUrl, Converter={ghfvs:NullToVisibilityConverter}}">
44+
45+
<Label Grid.Column="2" HorizontalContentAlignment="Stretch" Visibility="{Binding HasAnnotations, Converter={ghfvs:BooleanToVisibilityConverter}}">
46+
<Hyperlink ToolTip="View checks"
47+
Command="{Binding Path=DataContext.ShowAnnotations, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type local:PullRequestDetailView}}}"
48+
CommandParameter="{Binding}">
49+
Checks
50+
</Hyperlink>
51+
</Label>
52+
53+
<Label Grid.Column="3" HorizontalContentAlignment="Stretch" Visibility="{Binding DetailsUrl, Converter={ghfvs:NullToVisibilityConverter}}">
5954
<Hyperlink ToolTip="{Binding DetailsUrl}" Command="{Binding OpenDetailsUrl}">Details</Hyperlink>
6055
</Label>
6156
</Grid>

src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestDetailView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252
<ItemsControl ItemsSource="{Binding Checks}" Margin="0 4 12 4">
253253
<ItemsControl.ItemsPanel>
254254
<ItemsPanelTemplate>
255-
<StackPanel Grid.IsSharedSizeScope="True" />
255+
<StackPanel Orientation="Vertical" HorizontalAlignment="Stretch"/>
256256
</ItemsPanelTemplate>
257257
</ItemsControl.ItemsPanel>
258258
</ItemsControl>

0 commit comments

Comments
 (0)