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

Commit c07100a

Browse files
committed
Don't use SharedSizeScope.
It was causing alignment to go a bit weird and wasn't really needed anyway.
1 parent a38c1cf commit c07100a

File tree

2 files changed

+17
-22
lines changed

2 files changed

+17
-22
lines changed

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

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@
2222
</ResourceDictionary>
2323
</Control.Resources>
2424

25-
<Grid Background="Red">
25+
<Grid>
2626
<Grid.ColumnDefinitions>
27-
<ColumnDefinition Width="Auto" SharedSizeGroup="Icon" />
28-
<ColumnDefinition Width="*" SharedSizeGroup="Title" />
29-
<ColumnDefinition Width="Auto" SharedSizeGroup="Links" />
27+
<ColumnDefinition Width="Auto"/>
28+
<ColumnDefinition Width="*"/>
29+
<ColumnDefinition Width="Auto"/>
30+
<ColumnDefinition Width="Auto"/>
3031
</Grid.ColumnDefinitions>
3132

3233
<Grid.RowDefinitions>
@@ -36,28 +37,22 @@
3637
<ghfvs:OcticonImage Grid.Column="0" Margin="0 0 4 0" Icon="check" Foreground="#2cbe4e" Visibility="{Binding Status, Converter={ghfvs:EqualsToVisibilityConverter Success}}"/>
3738
<ghfvs:OcticonImage Grid.Column="0" Margin="0 0 4 0" Icon="x" Foreground="#cb2431" Visibility="{Binding Status, Converter={ghfvs:EqualsToVisibilityConverter Failure}}"/>
3839
<ghfvs:OcticonImage Grid.Column="0" Margin="0 0 4 0" Icon="primitive_dot" Foreground="#f1c647" Visibility="{Binding Status, Converter={ghfvs:EqualsToVisibilityConverter Pending}}"/>
39-
<!--
40-
<Image Grid.Column="1" Source="{Binding Avatar}" Height="16" Width="16" />
41-
-->
40+
4241
<Label Grid.Column="1" Foreground="{DynamicResource VsBrush.WindowText}">
4342
<TextBlock TextTrimming="CharacterEllipsis" Text="{Binding Title}" />
4443
</Label>
45-
<!--
46-
<Label Grid.Column="3" HorizontalAlignment="Right" Content="{Binding Description}" ToolTip="{Binding Description}" />
47-
-->
48-
<StackPanel Background="Blue" Orientation="Horizontal" HorizontalAlignment="Right" Grid.Column="2">
49-
<Label HorizontalContentAlignment="Stretch" Visibility="{Binding HasAnnotations, Converter={ghfvs:BooleanToVisibilityConverter}}">
50-
<Hyperlink ToolTip="View checks"
44+
45+
<Label Grid.Column="2" HorizontalContentAlignment="Stretch" Visibility="{Binding HasAnnotations, Converter={ghfvs:BooleanToVisibilityConverter}}">
46+
<Hyperlink ToolTip="View checks"
5147
Command="{Binding Path=DataContext.ShowAnnotations, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type local:PullRequestDetailView}}}"
5248
CommandParameter="{Binding}">
53-
Checks
54-
</Hyperlink>
55-
</Label>
56-
57-
<Label HorizontalContentAlignment="Stretch" Visibility="{Binding DetailsUrl, Converter={ghfvs:NullToVisibilityConverter}}">
58-
<Hyperlink ToolTip="{Binding DetailsUrl}" Command="{Binding OpenDetailsUrl}">Details</Hyperlink>
59-
</Label>
60-
</StackPanel>
49+
Checks
50+
</Hyperlink>
51+
</Label>
52+
53+
<Label Grid.Column="3" HorizontalContentAlignment="Stretch" Visibility="{Binding DetailsUrl, Converter={ghfvs:NullToVisibilityConverter}}">
54+
<Hyperlink ToolTip="{Binding DetailsUrl}" Command="{Binding OpenDetailsUrl}">Details</Hyperlink>
55+
</Label>
6156
</Grid>
6257
</local:GenericPullRequestCheckView>
6358

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 Orientation="Vertical" HorizontalAlignment="Stretch" Grid.IsSharedSizeScope="True" />
255+
<StackPanel Orientation="Vertical" HorizontalAlignment="Stretch"/>
256256
</ItemsPanelTemplate>
257257
</ItemsControl.ItemsPanel>
258258
</ItemsControl>

0 commit comments

Comments
 (0)