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

Hide resolved comments in changes tree; Indicate resolved comments on margin #2253

Merged
StanleyGoldman merged 16 commits into from
Mar 26, 2019
Merged

Hide resolved comments in changes tree; Indicate resolved comments on margin #2253

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5d787b8
Update GraphQL schema on net46 branch
jcansdale Mar 1, 2019
e7f5179
Update GraphQL query to use ReviewThreads
jcansdale Mar 1, 2019
f8d092d
Add IsResolved to PullRequestReviewThreadModel
jcansdale Mar 4, 2019
31ca065
Merge remote-tracking branch 'origin/master' into fixes/2245-comment-…
jcansdale Mar 4, 2019
7a41406
Only show unresolved comments on changes tree
jcansdale Mar 4, 2019
085bfa9
Clarify IsResolved summary
jcansdale Mar 4, 2019
8e4a5a9
Add downlevel support for GitHub Enterprise
jcansdale Mar 4, 2019
c75b321
Show warning on comment thread resolved
jcansdale Mar 4, 2019
a489f5d
Indicate resolved comments with an empty circle
jcansdale Mar 5, 2019
1806beb
Use VS info icon and lighter background color
donokuda Mar 5, 2019
e068eb4
Prefer InfoBrushes
donokuda Mar 5, 2019
e3ea7db
Merge branch 'master' into fixes/2245-comment-thread-resolved-status
jcansdale Mar 19, 2019
48efdf9
Support of a null commit author
jcansdale Mar 19, 2019
a16d2a7
Merge branch 'master' into fixes/2245-comment-thread-resolved-status
jcansdale Mar 20, 2019
99ddc34
Merge branch 'master' into fixes/2245-comment-thread-resolved-status
StanleyGoldman Mar 26, 2019
e3be788
Adding stub resource to other language files
StanleyGoldman Mar 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use VS info icon and lighter background color
  • Loading branch information
@donokuda
donokuda committed Mar 5, 2019
commit 1806beb060eee6c6752bbc3e2ef1a802c067cd05
42 changes: 23 additions & 19 deletions src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
xmlns:cache="clr-namespace:GitHub.UI.Helpers;assembly=GitHub.UI"
xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI"
xmlns:ghfvs="https://github.com/github/VisualStudio"
xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
xmlns:catalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
mc:Ignorable="d"
d:DesignHeight="200" d:DesignWidth="500">
<UserControl.Resources>
Expand Down Expand Up @@ -63,25 +65,6 @@
</DockPanel>
</Border>

<Border DockPanel.Dock="Top"
Background="{DynamicResource {x:Static SystemColors.InfoBrushKey}}"
Padding="8">
<Border.Style>
<Style TargetType="Border">
<Setter Property="Visibility" Value="Collapsed"/>
<Style.Triggers>
<DataTrigger Binding="{Binding Thread.IsResolved}" Value="True">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Border.Style>
<DockPanel>
<ui:OcticonImage DockPanel.Dock="Left" Icon="info" Margin="0 0 8 0"/>
<TextBlock TextWrapping="Wrap" Text="{x:Static ghfvs:Resources.ThisConversationWasMarkedAsResolved}"/>
</DockPanel>
</Border>

<Border DockPanel.Dock="Top"
BorderThickness="0 0 0 1"
Background="{DynamicResource VsBrush.CommandBarOptionsBackground}"
Expand Down Expand Up @@ -120,6 +103,27 @@
</StackPanel>
</Border>

<Border DockPanel.Dock="Top"
Background="{DynamicResource GitHubPeekViewBackground}"
BorderBrush="{DynamicResource GitHubButtonBorderBrush}"
BorderThickness="0 0 0 1"
Padding="8">
<Border.Style>
<Style TargetType="Border">
<Setter Property="Visibility" Value="Collapsed"/>
<Style.Triggers>
<DataTrigger Binding="{Binding Thread.IsResolved}" Value="True">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Border.Style>
<DockPanel>
<imaging:CrispImage Width="16" Height="16" Moniker="{x:Static catalog:KnownMonikers.StatusInformation}" Visibility="{Binding Model.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Notice}}"/>
<TextBlock TextWrapping="Wrap" Text="{x:Static ghfvs:Resources.ThisConversationWasMarkedAsResolved}"/>
</DockPanel>
</Border>

<ScrollViewer Name="threadScroller"
VerticalScrollBarVisibility="Auto"
Background="{DynamicResource GitHubPeekViewBackground}">
Expand Down