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

WIP: Prefer text instead of icon in checks list #2074

Merged
Parent: Check Run Annotations Inline
merged 7 commits into from
Nov 21, 2018
Merged

WIP: Prefer text instead of icon in checks list #2074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a762e9a
Update icon to text
donokuda Nov 20, 2018
fc7a955
An attempt at keeping the width of each row consistent
donokuda Nov 20, 2018
5580c06
Back to the stack
donokuda Nov 20, 2018
766cae5
i-have-no-clue-what-im-doing.jpg
donokuda Nov 20, 2018
24a501d
Merge branch 'features/check-suite-annotations-inline' into donokuda/…
StanleyGoldman Nov 21, 2018
a38c1cf
Add missing CommandParameter
StanleyGoldman Nov 21, 2018
c07100a
Don't use SharedSizeScope.
grokys Nov 21, 2018
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
35 changes: 15 additions & 20 deletions src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCheckView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@

<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" SharedSizeGroup="ColumnZero" />
<ColumnDefinition Width="*" SharedSizeGroup="ColumnOne" />
<ColumnDefinition Width="Auto" SharedSizeGroup="ColumnTwo" />
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto" SharedSizeGroup="ColumnFour" />
<ColumnDefinition MinWidth="50" Width="Auto" SharedSizeGroup="ColumnFive" />
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>

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

<!--
<Image Grid.Column="1" Source="{Binding AvatarUrl}" Height="16" Width="16" />
-->

<Label Grid.Column="2" Foreground="{DynamicResource VsBrush.WindowText}" Content="{Binding Title}"/>
<!--
<Label Grid.Column="3" HorizontalAlignment="Right" Content="{Binding Description}" ToolTip="{Binding Description}" />
-->
<Label Grid.Column="3" HorizontalAlignment="Right">
<ghfvs:OcticonButton Command="{Binding Path=DataContext.ShowAnnotations, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type local:PullRequestDetailView}}}"
CommandParameter="{Binding}"
Visibility="{Binding HasAnnotations, Converter={ghfvs:BooleanToVisibilityConverter}}"
Margin="0 0 0 0" Icon="file_code" Foreground="Black" />
<Label Grid.Column="1" Foreground="{DynamicResource VsBrush.WindowText}">
<TextBlock TextTrimming="CharacterEllipsis" Text="{Binding Title}" />
</Label>
<Label Grid.Column="4" HorizontalAlignment="Right"
Visibility="{Binding DetailsUrl, Converter={ghfvs:NullToVisibilityConverter}}">

<Label Grid.Column="2" HorizontalContentAlignment="Stretch" Visibility="{Binding HasAnnotations, Converter={ghfvs:BooleanToVisibilityConverter}}">
<Hyperlink ToolTip="View checks"
Command="{Binding Path=DataContext.ShowAnnotations, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type local:PullRequestDetailView}}}"
CommandParameter="{Binding}">
Checks
</Hyperlink>
</Label>

<Label Grid.Column="3" HorizontalContentAlignment="Stretch" Visibility="{Binding DetailsUrl, Converter={ghfvs:NullToVisibilityConverter}}">
<Hyperlink ToolTip="{Binding DetailsUrl}" Command="{Binding OpenDetailsUrl}">Details</Hyperlink>
</Label>
</Grid>
Expand Down
2 changes: 1 addition & 1 deletion src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestDetailView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
<ItemsControl ItemsSource="{Binding Checks}" Margin="0 4 12 4">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Grid.IsSharedSizeScope="True" />
<StackPanel Orientation="Vertical" HorizontalAlignment="Stretch"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
</ItemsControl>
Expand Down