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

Commit c7e25fd

Browse files
committed
Use a grid instead
1 parent 384c83a commit c7e25fd

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

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

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -372,12 +372,20 @@
372372
</Grid.RowDefinitions>
373373

374374
<StackPanel Grid.Row="0" Orientation="Vertical">
375-
<StackPanel Margin="10,0,10,10" Orientation="Horizontal">
376-
<ui:OcticonImage Icon="git_branch" Foreground="{DynamicResource GitHubVsGrayText}" />
377-
<ui:GitHubActionLink x:Name="branchSelectionButton" Content="master" HasDropDown="True" Margin="5,0,0,0" VerticalAlignment="Center" Click="branchSelectionButton_Click" />
378-
<ui:OcticonImage Height="13" Icon="chevron_left" Foreground="{DynamicResource GitHubVsGrayText}" Margin="0,1,0,0" VerticalAlignment="Center" />
379-
<Label Content="{Binding CurrentBranchName}" Foreground="{DynamicResource GitHubVsToolWindowText}"/>
380-
<ui:OcticonImage Icon="check" Foreground="Green" HorizontalAlignment="Right"/>
375+
<Grid Margin="10,0,10,10">
376+
<Grid.ColumnDefinitions>
377+
<ColumnDefinition Width="Auto" />
378+
<ColumnDefinition Width="*" />
379+
</Grid.ColumnDefinitions>
380+
381+
<StackPanel Grid.Column="0" Orientation="Horizontal">
382+
<ui:OcticonImage Icon="git_branch" Foreground="{DynamicResource GitHubVsGrayText}" />
383+
<ui:GitHubActionLink x:Name="branchSelectionButton" Content="master" HasDropDown="True" Margin="5,0,0,0" VerticalAlignment="Center" Click="branchSelectionButton_Click" />
384+
<ui:OcticonImage Height="13" Icon="chevron_left" Foreground="{DynamicResource GitHubVsGrayText}" Margin="0,1,0,0" VerticalAlignment="Center" />
385+
<Label Content="{Binding CurrentBranchName}" Foreground="{DynamicResource GitHubVsToolWindowText}"/>
386+
</StackPanel>
387+
388+
<ui:OcticonImage Grid.Column="1" Icon="check" Foreground="Green" HorizontalAlignment="Right"/>
381389
<Popup
382390
x:Name="branchPopup"
383391
AllowsTransparency="True"
@@ -429,7 +437,7 @@
429437
</Grid>
430438
</Border>
431439
</Popup>
432-
</StackPanel>
440+
</Grid>
433441

434442
</StackPanel>
435443

0 commit comments

Comments
 (0)