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

Commit 4e38c00

Browse files
donokudadonokuda
committed
Move things into a border component
1 parent 65bb008 commit 4e38c00

File tree

1 file changed

+71
-69
lines changed

1 file changed

+71
-69
lines changed

‎src/GitHub.VisualStudio.UI/Views/CommentView.xaml‎

Lines changed: 71 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -37,80 +37,82 @@
3737

3838
<Grid>
3939
<!-- Displays an existing comment-->
40-
<StackPanel Orientation="Vertical" Margin="4">
41-
<StackPanel.Style>
42-
<Style TargetType="FrameworkElement">
43-
<Setter Property="Visibility" Value="Collapsed"/>
44-
<Style.Triggers>
45-
<DataTrigger Binding="{Binding EditState}" Value="None">
46-
<Setter Property="Visibility" Value="Visible"/>
47-
</DataTrigger>
48-
</Style.Triggers>
49-
</Style>
50-
</StackPanel.Style>
51-
52-
<DockPanel>
53-
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left" >
54-
<controls:AccountAvatar Width="16"
55-
Height="16"
56-
Account="{Binding Author}"/>
57-
58-
<TextBlock Foreground="{DynamicResource GitHubVsToolWindowText}" FontWeight="Bold" Text="{Binding Author.Login}" Margin="4 0"/>
59-
<ui:GitHubActionLink Content="{Binding UpdatedAt, Converter={ui:DurationToStringConverter}}"
60-
Command="{Binding OpenOnGitHub}"
61-
Foreground="{DynamicResource GitHubVsToolWindowText}"
62-
Opacity="0.75" />
63-
<Border Background="{DynamicResource VsBrush.InfoBackground}"
64-
BorderBrush="{DynamicResource VsBrush.AccentPale}"
65-
BorderThickness="1"
66-
CornerRadius="3"
67-
Padding="2 1"
68-
Visibility="{Binding IsPending, Converter={ui:BooleanToVisibilityConverter}, FallbackValue=Collapsed}">
69-
<TextBlock FontSize="10" Text="{x:Static ghfvs:Resources.Pending}" />
70-
</Border>
71-
</StackPanel>
72-
73-
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" DockPanel.Dock="Right"
74-
Visibility="{Binding CanDelete, Converter={ui:BooleanToVisibilityConverter}}">
75-
<ui:OcticonButton Command="{Binding BeginEdit}"
76-
Height="16"
77-
Width="20"
78-
Margin="0 0 4 0"
79-
Background="Transparent"
80-
Foreground="{DynamicResource GitHubVsToolWindowText}"
81-
Icon="pencil"/>
82-
<ui:OcticonButton Command="{Binding Delete}"
83-
Width="16"
84-
Height="16"
85-
Margin="0"
86-
Background="Transparent"
87-
Foreground="{DynamicResource GitHubVsToolWindowText}"
88-
Icon="x"/>
89-
</StackPanel>
90-
</DockPanel>
91-
92-
<markdig:MarkdownViewer Grid.Column="1" Grid.Row="1"
93-
Margin="0 2 0 0"
94-
Foreground="{DynamicResource VsBrush.WindowText}"
95-
Markdown="{Binding Body}"/>
96-
97-
<DockPanel Grid.Column="1" Grid.Row="2"
98-
Margin="0 4"
99-
HorizontalAlignment="Left"
100-
TextBlock.Foreground="Red">
101-
<DockPanel.Style>
40+
<Border BorderBrush="{DynamicResource VsBrush.ButtonBorder}" BorderThickness="1" HorizontalAlignment="Stretch" Margin="0 0 0 4">
41+
<StackPanel Orientation="Vertical" Margin="4">
42+
<StackPanel.Style>
10243
<Style TargetType="FrameworkElement">
44+
<Setter Property="Visibility" Value="Collapsed"/>
10345
<Style.Triggers>
104-
<DataTrigger Binding="{Binding ErrorMessage}" Value="{x:Null}">
105-
<Setter Property="Visibility" Value="Collapsed"/>
46+
<DataTrigger Binding="{Binding EditState}" Value="None">
47+
<Setter Property="Visibility" Value="Visible"/>
10648
</DataTrigger>
10749
</Style.Triggers>
10850
</Style>
109-
</DockPanel.Style>
110-
<ui:OcticonImage DockPanel.Dock="Left" Icon="alert" Margin="0 0 4 0"/>
111-
<TextBlock Text="{Binding ErrorMessage}" TextWrapping="Wrap"/>
112-
</DockPanel>
113-
</StackPanel>
51+
</StackPanel.Style>
52+
53+
<DockPanel>
54+
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left" >
55+
<controls:AccountAvatar Width="16"
56+
Height="16"
57+
Account="{Binding Author}"/>
58+
59+
<TextBlock Foreground="{DynamicResource GitHubVsToolWindowText}" FontWeight="Bold" Text="{Binding Author.Login}" Margin="4 0"/>
60+
<ui:GitHubActionLink Content="{Binding UpdatedAt, Converter={ui:DurationToStringConverter}}"
61+
Command="{Binding OpenOnGitHub}"
62+
Foreground="{DynamicResource GitHubVsToolWindowText}"
63+
Opacity="0.75" />
64+
<Border Background="{DynamicResource VsBrush.InfoBackground}"
65+
BorderBrush="{DynamicResource VsBrush.AccentPale}"
66+
BorderThickness="1"
67+
CornerRadius="3"
68+
Padding="2 1"
69+
Visibility="{Binding IsPending, Converter={ui:BooleanToVisibilityConverter}, FallbackValue=Collapsed}">
70+
<TextBlock FontSize="10" Text="{x:Static ghfvs:Resources.Pending}" />
71+
</Border>
72+
</StackPanel>
73+
74+
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" DockPanel.Dock="Right"
75+
Visibility="{Binding CanDelete, Converter={ui:BooleanToVisibilityConverter}}">
76+
<ui:OcticonButton Command="{Binding BeginEdit}"
77+
Height="16"
78+
Width="20"
79+
Margin="0 0 4 0"
80+
Background="Transparent"
81+
Foreground="{DynamicResource GitHubVsToolWindowText}"
82+
Icon="pencil"/>
83+
<ui:OcticonButton Command="{Binding Delete}"
84+
Width="16"
85+
Height="16"
86+
Margin="0"
87+
Background="Transparent"
88+
Foreground="{DynamicResource GitHubVsToolWindowText}"
89+
Icon="x"/>
90+
</StackPanel>
91+
</DockPanel>
92+
93+
<markdig:MarkdownViewer Grid.Column="1" Grid.Row="1"
94+
Margin="0 2 0 0"
95+
Foreground="{DynamicResource VsBrush.WindowText}"
96+
Markdown="{Binding Body}"/>
97+
98+
<DockPanel Grid.Column="1" Grid.Row="2"
99+
Margin="0 4"
100+
HorizontalAlignment="Left"
101+
TextBlock.Foreground="Red">
102+
<DockPanel.Style>
103+
<Style TargetType="FrameworkElement">
104+
<Style.Triggers>
105+
<DataTrigger Binding="{Binding ErrorMessage}" Value="{x:Null}">
106+
<Setter Property="Visibility" Value="Collapsed"/>
107+
</DataTrigger>
108+
</Style.Triggers>
109+
</Style>
110+
</DockPanel.Style>
111+
<ui:OcticonImage DockPanel.Dock="Left" Icon="alert" Margin="0 0 4 0"/>
112+
<TextBlock Text="{Binding ErrorMessage}" TextWrapping="Wrap"/>
113+
</DockPanel>
114+
</StackPanel>
115+
</Border>
114116

115117
<!-- Displays edit view or a reply placeholder-->
116118
<Grid>

0 commit comments

Comments
 (0)