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

Commit fc456f8

Browse files
committed
🎨 Some cleanup and test long PR names
1 parent 5b2a70c commit fc456f8

File tree

3 files changed

+28
-26
lines changed

3 files changed

+28
-26
lines changed

src/GitHub.App/SampleData/PullRequestListViewModelDesigner.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public PullRequestListViewModelDesigner()
2626
new AccountDesigner { Login = "haacked", IsUser = true },
2727
new AccountDesigner { Login = "shana", IsUser = true },
2828
DateTimeOffset.Now - TimeSpan.FromMinutes(2)) { CommentCount = 4, HasNewComments = false });
29-
prs.Add(new PullRequestModel(409, "Fix publish button style",
29+
prs.Add(new PullRequestModel(409, "Fix publish button style and a really, really long name for this thing... OMG look how long this name is yusssss",
3030
new AccountDesigner { Login = "shana", IsUser = true },
3131
new AccountDesigner { Login = "Haacked", IsUser = true },
3232
DateTimeOffset.Now - TimeSpan.FromHours(5)) { CommentCount = 27, HasNewComments = true });

src/GitHub.VisualStudio/UI/Views/Controls/PullRequestListItem.xaml

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
Height="32"
3636
Margin="0,0,9,0"
3737
RenderOptions.BitmapScalingMode="HighQuality"
38+
VerticalAlignment="Top"
3839
Source="{Binding Author.Avatar}" />
3940
<TextBlock x:Name="title"
4041
Grid.Row="0"
@@ -46,32 +47,33 @@
4647
Foreground="{DynamicResource GitHubVsToolWindowText}"
4748
Text="{Binding Title}"
4849
TextWrapping="WrapWithOverflow" />
49-
<ui:OcticonImage x:Name="comment_icon"
50-
Grid.Row="0"
51-
Grid.Column="2"
52-
Width="14"
53-
Height="14"
54-
Margin="0,0,1,0"
55-
HorizontalAlignment="Right"
56-
VerticalAlignment="Center"
57-
Foreground="{DynamicResource GitHubVsToolWindowText}"
58-
Icon="comment">
59-
<ui:OcticonImage.Style>
60-
<Style>
61-
<Style.Triggers>
62-
<DataTrigger Binding="{Binding CommentCount}" Value="0">
63-
<Setter Property="FrameworkElement.IsEnabled" Value="False" />
64-
</DataTrigger>
65-
</Style.Triggers>
66-
</Style>
67-
</ui:OcticonImage.Style>
50+
<ui:OcticonImage x:Name="comment_icon"
51+
Grid.Row="0"
52+
Grid.Column="2"
53+
Icon="comment"
54+
Margin="5,0"
55+
Width="14"
56+
Height="14"
57+
VerticalAlignment="Top"
58+
Foreground="{DynamicResource GitHubVsToolWindowText}" >
59+
<!--
60+
<ui:OcticonImage.Style>
61+
<Style>
62+
<Style.Triggers>
63+
<DataTrigger Binding="{Binding CommentCount}" Value="0">
64+
<Setter Property="FrameworkElement.IsEnabled" Value="False" />
65+
</DataTrigger>
66+
</Style.Triggers>
67+
</Style>
68+
</ui:OcticonImage.Style>
69+
-->
70+
</ui:OcticonImage>
6871

69-
</ui:OcticonImage>
7072
<TextBlock x:Name="comment_count"
7173
Grid.Row="0"
7274
Grid.Column="3"
7375
HorizontalAlignment="Left"
74-
VerticalAlignment="Center"
76+
VerticalAlignment="Top"
7577
FontFamily="Segoe UI"
7678
FontSize="12"
7779
Foreground="{DynamicResource GitHubVsToolWindowText}"
@@ -85,15 +87,16 @@
8587
</Style.Triggers>
8688
</Style>
8789
</TextBlock.Style>
88-
8990
</TextBlock>
91+
9092
<ui:OcticonImage x:Name="comment_new"
9193
Grid.Row="0"
9294
Grid.Column="4"
9395
Width="10"
9496
Height="10"
9597
HorizontalAlignment="Right"
96-
VerticalAlignment="Center"
98+
VerticalAlignment="Top"
99+
Margin="0,3"
97100
Foreground="Green"
98101
Icon="primitive_dot"
99102
Visibility="{Binding HasNewComments,

src/GitHub.VisualStudio/UI/Views/PullRequestListView.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,7 @@
283283
RelativeSource={RelativeSource FindAncestor,
284284
AncestorType={x:Type local:PullRequestListView}}}"
285285
Content="Create New" />
286-
287-
</Grid>
286+
</Grid>
288287

289288
<ListView x:Name="pullRequests"
290289
Margin="0,0,0,0"

0 commit comments

Comments
 (0)