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

Commit 9e03d68

Browse files
jcansdalejcansdale
authored
Merge pull request #1747 from github/fixes/1738-pr-details-scrollbar
Tidy up PR details XAML.
2 parents 30ce6a2 + bc5309f commit 9e03d68

File tree

1 file changed

+27
-67
lines changed

1 file changed

+27
-67
lines changed

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

Lines changed: 27 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<Binding>
2121
<Binding.Source>
2222
<ghfvs:PullRequestDetailViewModelDesigner SourceBranchDisplayName="shana/error-handling-a-ridiculously-long-branch-name-because-why-not"
23-
TargetBranchDisplayName="master-is-always-stable"
24-
CommentCount="10">
23+
TargetBranchDisplayName="master-is-always-stable"
24+
CommentCount="10">
2525
<ghfvs:PullRequestDetailViewModelDesigner.UpdateState>
2626
<ghfvs:PullRequestUpdateStateDesigner CommitsAhead="0" CommitsBehind="0" UpToDate="True"/>
2727
</ghfvs:PullRequestDetailViewModelDesigner.UpdateState>
@@ -78,94 +78,54 @@
7878
<CommandBinding Command="{x:Static markdig:Commands.Hyperlink}" Executed="OpenHyperlink" />
7979
</FrameworkElement.CommandBindings>
8080

81-
<DockPanel Grid.IsSharedSizeScope="True" Margin="8 0">
82-
<Grid DockPanel.Dock="Top">
83-
<Grid.ColumnDefinitions>
84-
<ColumnDefinition Width="*" />
85-
<ColumnDefinition Width="Auto" />
86-
</Grid.ColumnDefinitions>
87-
88-
<Grid.RowDefinitions>
89-
<RowDefinition Height="*" />
90-
<RowDefinition Height="Auto" />
91-
</Grid.RowDefinitions>
92-
93-
<TextBlock Grid.Column="0"
94-
Style="{DynamicResource {x:Static vsui:VsResourceKeys.TextBlockEnvironment122PercentFontSizeStyleKey}}"
81+
<DockPanel Grid.IsSharedSizeScope="True">
82+
<StackPanel DockPanel.Dock="Top"
83+
Orientation="Vertical"
84+
Margin="8 0 0 0">
85+
86+
<!-- Title -->
87+
<TextBlock Style="{DynamicResource {x:Static vsui:VsResourceKeys.TextBlockEnvironment122PercentFontSizeStyleKey}}"
9588
TextWrapping="Wrap"
9689
Margin="0 0 5 3"
9790
Text="{Binding Model.Title}"/>
9891

99-
<StackPanel Grid.Column="0"
100-
Grid.Row="1"
101-
Orientation="Horizontal">
102-
92+
<!-- State and branches -->
93+
<StackPanel Orientation="Horizontal">
10394
<TextBlock FontWeight="Bold"
104-
Margin="0 0 4 0"
10595
VerticalAlignment="Center"
10696
Text="{Binding Model.State, Converter={StaticResource AllCaps}}"
10797
Style="{StaticResource StateIndicator}"/>
10898

109-
<Rectangle Grid.Column="1" Margin="5 0 10 0" Width="1" Height="12" VerticalAlignment="Center" Style="{DynamicResource Separator}" />
99+
<Rectangle Margin="9 0" Width="1" Height="12" VerticalAlignment="Center" Style="{DynamicResource Separator}" />
110100

111-
<!-- source and target branches -->
112-
<Grid Margin="0 -3" HorizontalAlignment="Left">
113-
<Grid.ColumnDefinitions>
114-
<ColumnDefinition Width="Auto"/>
115-
<ColumnDefinition Width="*"/>
116-
<ColumnDefinition Width="Auto"/>
117-
<ColumnDefinition Width="*"/>
118-
</Grid.ColumnDefinitions>
101+
<Border Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" CornerRadius="2" Padding="5 1" Background="{DynamicResource GitHubBranchNameBackgroundBrush}">
102+
<TextBlock FontFamily="Consolas" TextTrimming="CharacterEllipsis" ToolTip="{Binding TargetBranchDisplayName, Mode=OneWay}" Text="{Binding TargetBranchDisplayName, Mode=OneWay}" />
103+
</Border>
119104

120-
<Border Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" CornerRadius="2" Padding="5 1" Background="{DynamicResource GitHubBranchNameBackgroundBrush}">
121-
<TextBlock FontFamily="Consolas" TextTrimming="CharacterEllipsis" ToolTip="{Binding TargetBranchDisplayName, Mode=OneWay}" Text="{Binding TargetBranchDisplayName, Mode=OneWay}" />
122-
</Border>
105+
<ghfvs:OcticonImage Grid.Column="2" VerticalAlignment="Center" Margin="5 3" Icon="arrow_left" />
123106

124-
<ghfvs:OcticonImage Grid.Column="2" VerticalAlignment="Center" Margin="5" Icon="arrow_left" />
107+
<Border Grid.Column="3" HorizontalAlignment="Left" VerticalAlignment="Center" CornerRadius="2" Padding="5 1" Background="{DynamicResource GitHubBranchNameBackgroundBrush}">
108+
<TextBlock FontFamily="Consolas" TextTrimming="CharacterEllipsis" ToolTip="{Binding SourceBranchDisplayName, Mode=OneWay}" Text="{Binding SourceBranchDisplayName, Mode=OneWay}" />
109+
</Border>
125110

126-
<Border Grid.Column="3" HorizontalAlignment="Left" VerticalAlignment="Center" CornerRadius="2" Padding="5 1" Background="{DynamicResource GitHubBranchNameBackgroundBrush}">
127-
<TextBlock FontFamily="Consolas" TextTrimming="CharacterEllipsis" ToolTip="{Binding SourceBranchDisplayName, Mode=OneWay}" Text="{Binding SourceBranchDisplayName, Mode=OneWay}" />
128-
</Border>
129-
</Grid>
130111
</StackPanel>
131-
</Grid>
132112

133-
<!-- Avatar, PR Title, Open/Merged/Closed state and actions area -->
134-
<Grid DockPanel.Dock="Top">
135-
<Grid.ColumnDefinitions>
136-
<ColumnDefinition Width="Auto"/>
137-
<ColumnDefinition Width="1*"/>
138-
<ColumnDefinition Width="Auto"/>
139-
</Grid.ColumnDefinitions>
140-
141-
<Grid.RowDefinitions>
142-
<RowDefinition Height="Auto"/>
143-
<RowDefinition Height="Auto"/>
144-
<RowDefinition Height="Auto"/>
145-
</Grid.RowDefinitions>
146-
147-
<StackPanel Grid.Column="1" Margin="0 0 6 0" Orientation="Vertical">
148-
<TextBlock Grid.Column="0" Opacity="0.5" VerticalAlignment="Center"
149-
Text="{Binding Model.UpdatedAt, StringFormat={x:Static prop:Resources.UpdatedFormat}, Converter={ghfvs:DurationToStringConverter}, Mode=OneWay}"/>
150-
</StackPanel>
113+
<!-- Updated at -->
114+
<TextBlock Opacity="0.5"
115+
Text="{Binding Model.UpdatedAt, StringFormat={x:Static prop:Resources.UpdatedFormat}, Converter={ghfvs:DurationToStringConverter}, Mode=OneWay}"/>
151116

152117
<!-- Git operation error message -->
153-
<TextBox Grid.Column="0"
154-
Grid.ColumnSpan="3"
155-
Grid.Row="2"
156-
Foreground="Red"
157-
Margin="0 2 0 0"
118+
<TextBox Foreground="Red"
119+
Margin="-2 4"
158120
Text="{Binding OperationError, Mode=OneWay}"
159-
VerticalAlignment="Center"
160-
TextWrapping="Wrap"
161121
Style="{StaticResource FlatReadOnlyTextBox}"
162122
Visibility="{Binding OperationError, Converter={ghfvs:NullToVisibilityConverter}}"/>
163-
</Grid>
123+
</StackPanel>
164124

165-
<Rectangle DockPanel.Dock="Top" Style="{StaticResource Separator}" Height="2" Margin="-8,5,-8,0"/>
125+
<Rectangle DockPanel.Dock="Top" Style="{StaticResource Separator}" Height="2" Margin="0,5,0,0"/>
166126

167127
<ScrollViewer CanContentScroll="True"
168-
Margin="0,0,-8,0"
128+
Padding="8 0 0 0"
169129
HorizontalScrollBarVisibility="Auto"
170130
VerticalScrollBarVisibility="Auto">
171131
<ghfvs:ScrollingVerticalStackPanel>

0 commit comments

Comments
 (0)