Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.
Merged
Changes from 1 commit
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
66181de
Changing InlineCommentTag to InlineTag
StanleyGoldman Sep 5, 2018
8cd11fd
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Sep 5, 2018
7ca9195
Working InlineTagger changes
StanleyGoldman Sep 5, 2018
b39c5a4
Fixing test
StanleyGoldman Sep 6, 2018
5174ee3
Adding another test
StanleyGoldman Sep 6, 2018
db07173
Rename class
StanleyGoldman Sep 6, 2018
bb30e4d
Adding functionality to create a tag object for a comment thread and …
StanleyGoldman Sep 6, 2018
85b060c
Adding different glyph types
StanleyGoldman Sep 7, 2018
a9d69db
Merge remote-tracking branch 'remotes/origin/features/check-suite-ann…
StanleyGoldman Sep 7, 2018
657292e
Renaming models and adding InlineAnnotationViewModel
StanleyGoldman Sep 7, 2018
7cf4eba
Displaing inline annotations
StanleyGoldman Sep 7, 2018
3eddd4c
More renaming
StanleyGoldman Sep 7, 2018
321d51e
Adding CheckRunName
StanleyGoldman Sep 7, 2018
3b8945d
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Sep 10, 2018
28a74ce
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Sep 10, 2018
219a823
Fixing the build
StanleyGoldman Sep 10, 2018
4f0f721
Rename DatabaseId to CheckRunId
StanleyGoldman Sep 10, 2018
ea3c850
Functionality to open an annotation tag from the file list
StanleyGoldman Sep 10, 2018
214e1a5
Renaming more InlineComment things
StanleyGoldman Sep 10, 2018
18dc78d
Link to inline review from file
StanleyGoldman Sep 10, 2018
b24f8a2
Restoring names of a lot of things
StanleyGoldman Sep 10, 2018
c1c229f
Undoing a lot of renaming
StanleyGoldman Sep 10, 2018
726de83
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Sep 10, 2018
af51110
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Sep 11, 2018
df89a29
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Sep 11, 2018
58e1797
More code cleanup
StanleyGoldman Sep 11, 2018
2e21ae9
Final code cleanup
StanleyGoldman Sep 11, 2018
b5dc961
Merge remote-tracking branch 'remotes/origin/features/check-suite-ann…
StanleyGoldman Sep 11, 2018
35f80ec
Fixes for code analysis
StanleyGoldman Sep 11, 2018
9dcae6e
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Sep 13, 2018
1e3f839
Displaying the check suite name in inline reviews
StanleyGoldman Sep 13, 2018
24882ab
Functionality to display status icons
StanleyGoldman Sep 27, 2018
86ef79a
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Sep 27, 2018
8802d49
Merge branch 'features/check-suite-annotations-inline' into checks-an…
StanleyGoldman Sep 27, 2018
388f47c
Fixing code after merge
StanleyGoldman Sep 27, 2018
f82a023
Updating nuget package
StanleyGoldman Sep 27, 2018
f2354ab
Other fixes after merge
StanleyGoldman Sep 27, 2018
a57985e
Adding image to check suitesa
StanleyGoldman Sep 27, 2018
e86bde3
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Oct 24, 2018
7183891
Fixing more issues after merge
StanleyGoldman Oct 24, 2018
a785da4
Additional changes
StanleyGoldman Oct 24, 2018
5596f3f
Last fix
StanleyGoldman Oct 24, 2018
80d5b9a
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Oct 24, 2018
d4c96b8
Merge branch 'features/check-suite-annotations-inline' into features/…
StanleyGoldman Oct 24, 2018
8a7454f
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Oct 24, 2018
2bbdbf8
Restoring session field
StanleyGoldman Oct 24, 2018
b494b6e
Fixing merge error
StanleyGoldman Oct 24, 2018
8d2323a
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Oct 29, 2018
88fd1ee
Start basic layout for inline annotations
donokuda Oct 29, 2018
f8a02f9
Little bit of text formatting
donokuda Oct 29, 2018
d7da753
Update colors and other formatting
donokuda Oct 30, 2018
68c7b34
Fix content not wrapping / stretching correctly
donokuda Oct 30, 2018
a94917d
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Oct 30, 2018
49703ed
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Oct 30, 2018
9921f72
Use VS images for status icons
donokuda Oct 30, 2018
a55182e
Make text work in Dark Theme
donokuda Oct 30, 2018
284b3b5
Dynamic colors
donokuda Oct 30, 2018
d6329c4
Merge branch 'features/check-suite-annotations-inline' into donokuda/…
donokuda Oct 30, 2018
05ed235
Fix build error
StanleyGoldman Oct 30, 2018
92903eb
Merge branch 'features/check-suite-annotations-inline' into donokuda/…
StanleyGoldman Oct 30, 2018
cbbb54b
Fixing compilation error
StanleyGoldman Oct 31, 2018
65bb008
Merge branch 'features/check-suite-annotations-inline' into donokuda/…
StanleyGoldman Oct 31, 2018
7d65ffe
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Nov 2, 2018
6877792
Merge branch 'features/check-suite-annotations-images' into features/…
StanleyGoldman Nov 5, 2018
2b0970a
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Nov 5, 2018
df93480
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Nov 5, 2018
6c22912
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Nov 6, 2018
d7ebeca
More interface removing
StanleyGoldman Nov 6, 2018
55f4f8a
Missing comma
StanleyGoldman Nov 6, 2018
9cbc9ff
Temporarily disabling the loading of images
StanleyGoldman Nov 6, 2018
4e38c00
Move things into a border component
donokuda Nov 6, 2018
b2810aa
Begin implementing comment styles
donokuda Nov 6, 2018
a327209
Tidy up margins
donokuda Nov 6, 2018
6e9bcae
Removing status and check avatars
StanleyGoldman Nov 6, 2018
5ba4d89
Fixing tests
StanleyGoldman Nov 6, 2018
6b8b712
Some more styling tweaks
donokuda Nov 6, 2018
480ca1a
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Nov 7, 2018
a28d67c
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Nov 7, 2018
f3ca06b
Cleanup
StanleyGoldman Nov 7, 2018
b829ea7
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Nov 7, 2018
d2b1532
Use a different theme color for comment borders
donokuda Nov 7, 2018
fda3134
Prefer VS Images over Octicons in file tree
donokuda Nov 7, 2018
e8a2a0a
Use info icon too
donokuda Nov 7, 2018
fc6ec4c
Merge remote-tracking branch 'origin/features/check-suite-annotations…
donokuda Nov 8, 2018
05ddfba
UpdatedAt -> CreatedAt
donokuda Nov 8, 2018
fb7fd99
Merge branch 'features/check-suite-annotations-inline' into donokuda/…
StanleyGoldman Nov 8, 2018
a674ec9
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Nov 8, 2018
33b38f2
Merge branch 'features/check-suite-annotations-inline' into donokuda/…
StanleyGoldman Nov 8, 2018
494099b
Merge pull request #2045 from github/donokuda/use-vs-icons-in-treeeeee
StanleyGoldman Nov 8, 2018
c8304fe
Merge remote-tracking branch 'remotes/origin/features/check-suite-ann…
StanleyGoldman Nov 8, 2018
7cd3139
Merge branch 'donokuda/check-suite-polish' of https://github.com/gith…
donokuda Nov 8, 2018
488ed64
Removing application slug
StanleyGoldman Nov 8, 2018
8e7ff5c
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Nov 9, 2018
f155567
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Nov 9, 2018
4a57e92
Merge branch 'features/check-suite-annotations-inline' into donokuda/…
StanleyGoldman Nov 9, 2018
c2c4c46
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Nov 9, 2018
56dd609
Merge branch 'features/check-suite-annotations-inline' into donokuda/…
StanleyGoldman Nov 9, 2018
2030133
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Nov 19, 2018
c06767e
Merge branch 'features/check-suite-annotations-inline' into donokuda/…
StanleyGoldman Nov 19, 2018
0708f8d
Merge pull request #2018 from github/donokuda/check-suite-polish
StanleyGoldman Nov 19, 2018
fe4d63b
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Nov 20, 2018
349c7c1
Fixes after merge
StanleyGoldman Nov 20, 2018
1e65e46
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Nov 20, 2018
129d863
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Nov 20, 2018
0a757ab
:fire: unnecessary grid markup
donokuda Nov 20, 2018
a5180cd
:fire: Commented lines
donokuda Nov 20, 2018
a762e9a
Update icon to text
donokuda Nov 20, 2018
fc7a955
An attempt at keeping the width of each row consistent
donokuda Nov 20, 2018
de64ba8
Fixing references
StanleyGoldman Nov 20, 2018
5580c06
Back to the stack
donokuda Nov 20, 2018
766cae5
i-have-no-clue-what-im-doing.jpg
donokuda Nov 20, 2018
99203ff
Addressing feedback
StanleyGoldman Nov 21, 2018
e731cd5
Removing handler
StanleyGoldman Nov 21, 2018
b01e6ec
Removing xaml import
StanleyGoldman Nov 21, 2018
967a749
IReadOnlyList > IReadOnlyCollection
StanleyGoldman Nov 21, 2018
04e6fc7
Adding comments
StanleyGoldman Nov 21, 2018
24a501d
Merge branch 'features/check-suite-annotations-inline' into donokuda/…
StanleyGoldman Nov 21, 2018
a38c1cf
Add missing CommandParameter
StanleyGoldman Nov 21, 2018
c07100a
Don't use SharedSizeScope.
grokys Nov 21, 2018
d738496
Merge pull request #2074 from github/donokuda/update-check-icon
StanleyGoldman Nov 21, 2018
d6ae911
Simplify view
StanleyGoldman Nov 21, 2018
6d91d7a
Merge branch 'features/check-suite-annotations-inline' of https://git…
donokuda Nov 21, 2018
769125c
Moving Annotations out of CommentThreadViewModel
StanleyGoldman Nov 21, 2018
88d9af7
Adjusting view
StanleyGoldman Nov 21, 2018
cf78034
Adjust annotation list item's margin and make text color dynamic
donokuda Nov 21, 2018
adfada0
Merge branch 'features/check-suite-annotations-inline' of https://git…
donokuda Nov 21, 2018
e9080ab
It's a circle now!
donokuda Nov 21, 2018
747084c
Update color
donokuda Nov 21, 2018
a0e2fcd
It's a lil diamond now
donokuda Nov 21, 2018
c67c5b4
Make everything a diamond
donokuda Nov 21, 2018
c110ad9
Fix bottom margin for reply textbox
donokuda Nov 21, 2018
271c2cd
Using only one view
StanleyGoldman Nov 21, 2018
4069376
Merge pull request #2077 from github/donokuda/polish-annotation-margin
StanleyGoldman Nov 21, 2018
fe6c09d
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Nov 21, 2018
f13d354
Attempting to control the comment ability
StanleyGoldman Nov 22, 2018
f3c4548
Correcting the xaml binding
StanleyGoldman Nov 26, 2018
ce065dc
Merge pull request #2080 from github/features/check-suite-annotations…
StanleyGoldman Nov 26, 2018
1da4ac2
Merge branch 'features/check-suite-annotations' into features/check-s…
StanleyGoldman Nov 26, 2018
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 images for status icons
  • Loading branch information
donokuda committed Oct 30, 2018
commit 9921f72fcf39a72606bf16c95ba2828c95366db4
10 changes: 7 additions & 3 deletions src/GitHub.VisualStudio.UI/Views/InlineAnnotationView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
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"
xmlns:markdig="clr-namespace:Markdig.Wpf;assembly=Markdig.Wpf"
mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300">

Expand Down Expand Up @@ -38,9 +40,11 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>

<ghfvs:OcticonImage Margin="0 0 0 0" Grid.Column="0" MinWidth="20" Icon="search" Foreground="CornflowerBlue" Visibility="{Binding Model.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Notice}}"/>
<ghfvs:OcticonImage Margin="0 0 0 0" Grid.Column="0" MinWidth="20" Icon="alert" Foreground="#f1c647" Visibility="{Binding Model.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Warning}}"/>
<ghfvs:OcticonImage Margin="0 0 0 0" Grid.Column="0" MinWidth="20" Icon="x" Foreground="#cb2431" Visibility="{Binding Model.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Failure}}"/>
<StackPanel Grid.Column="0" Grid.Row="0" Background="Transparent" VerticalAlignment="Center">
<imaging:CrispImage Width="16" Height="16" Moniker="{x:Static catalog:KnownMonikers.StatusInformation}" Visibility="{Binding Model.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Notice}}"/>
<imaging:CrispImage Width="16" Height="16" Moniker="{x:Static catalog:KnownMonikers.StatusWarning}" Visibility="{Binding Model.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Warning}}"/>
<imaging:CrispImage Width="16" Height="16" Moniker="{x:Static catalog:KnownMonikers.StatusError}" Visibility="{Binding Model.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Failure}}"/>
</StackPanel>

<TextBlock Grid.Column="1" Grid.Row="0" Margin="4 0 0 0">
<Run FontWeight="SemiBold" Text="{Binding Model.Path, Mode=OneWay}"/>
Expand Down