github · grokys · Aug 8, 2017 · Jul 14, 2017 · Jul 14, 2017 · Jul 14, 2017
diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
@@ -399,9 +399,10 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Page Include="Properties\DesignTimeResources.xaml">
+    <Page Include="Properties\DesignTimeResources.xaml" Condition="'$(DesignTime)'=='true' OR ('$(SolutionPath)'!='' AND Exists('$(SolutionPath)') AND '$(BuildingInsideVisualStudio)'!='true' AND '$(BuildingInsideExpressionBlend)'!='true')">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
+      <ContainsDesignTimeResources>true</ContainsDesignTimeResources>
     </Page>
     <Page Include="Views\TooltipCommentThreadView.xaml">
       <Generator>MSBuild:Compile</Generator>

diff --git a/src/GitHub.InlineReviews/InlineCommentMarginProvider.cs b/src/GitHub.InlineReviews/InlineCommentMarginProvider.cs
@@ -47,10 +47,10 @@ public InlineCommentMarginProvider(
         public IWpfTextViewMargin CreateMargin(IWpfTextViewHost wpfTextViewHost, IWpfTextViewMargin parent)
         {
             var textView = wpfTextViewHost.TextView;
-            var editorFormatMap = editorFormatMapService.GetEditorFormatMap(textView);
-            var glyphFactory = new InlineCommentGlyphFactory(peekService, textView, editorFormatMap);
+            var glyphFactory = new InlineCommentGlyphFactory(peekService, textView);
 
             Func<Grid> gridFactory = () => new GlyphMarginGrid();
+            var editorFormatMap = editorFormatMapService.GetEditorFormatMap(textView);
             return CreateMargin(glyphFactory, gridFactory, wpfTextViewHost, parent, editorFormatMap);
         }
 

diff --git a/src/GitHub.InlineReviews/Tags/AddInlineCommentGlyph.xaml b/src/GitHub.InlineReviews/Tags/AddInlineCommentGlyph.xaml
@@ -2,36 +2,55 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:cache="clr-namespace:GitHub.UI.Helpers;assembly=GitHub.UI"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              mc:Ignorable="d">
-    <UserControl.Resources>
-        <SolidColorBrush x:Key="DiffChangeBackground" Color="DarkSlateGray" />
-        <SolidColorBrush x:Key="AddDiffChangeBackground" Color="Green" />
-        <SolidColorBrush x:Key="RemovedDiffChangeBackground" Color="Red" />
-    </UserControl.Resources>
 
-    <Grid Background="{DynamicResource DiffChangeBackground}">
-        <Viewbox x:Name="AddViewbox">
-            <Path
-          Data="M13 2H1c-0.55 0-1 0.45-1 1v8c0 0.55 0.45 1 1 1h2v3.5l3.5-3.5h6.5c0.55 0 1-0.45 1-1V3c0-0.55-0.45-1-1-1z m0 9H6L4 13V11H1V3h12v8z M7,5 L7,9 M5,7 L9,7">
-                <Path.Style>
-                    <Style TargetType="Path">
+    <!-- Resourcess are defined in \GitHub.VisualStudio.UI\Styles\Theme*.xaml (and Properties\DesignTimeResources.xaml) -->
+    <UserControl.Style>
+        <Style TargetType="UserControl">
+            <Style.Triggers>
+                <DataTrigger Binding="{Binding DiffChangeType}" Value="Add">
+                    <Setter Property="Background" Value="{DynamicResource GitHubDiffChangeBackground.Add}" />
+                </DataTrigger>
+
+                <DataTrigger Binding="{Binding DiffChangeType}" Value="Delete">
+                    <Setter Property="Background" Value="{DynamicResource GitHubDiffChangeBackground.Delete}" />
+                </DataTrigger>
+
+                <DataTrigger Binding="{Binding DiffChangeType}" Value="None">
+                    <Setter Property="Background" Value="{DynamicResource GitHubDiffChangeBackground.None}" />
+                </DataTrigger>
+            </Style.Triggers>
+        </Style>
+    </UserControl.Style>
+
+    <Grid>
+        <Border BorderBrush="{DynamicResource VsBrush.ScrollBarBackground}" BorderThickness="0,0,1,0" />
+        <Viewbox x:Name="AddViewbox" Margin="1,1,0,0">
+            <Canvas Width="14" Height="14">
+                <Rectangle Width="13" Height="13" />
+                <Rectangle Stroke="#313131" Fill="Transparent" Opacity="0.163" Width="13" Height="13" />
+                <Path Canvas.Top="-0.5" Canvas.Left="-0.5" Fill="#FFF" Data="M11 8H8v3H6V8H3V6h3V3h2v3h3z"/>
+
+                <Canvas.Resources>
+
A3E2
                    <Style TargetType="Rectangle">
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding DiffChangeType}" Value="Add">
-                                <Setter Property="Stroke" Value="{DynamicResource AddDiffChangeBackground}" />
+                                <Setter Property="Fill" Value="{DynamicResource GitHubDiffGlyphFill.Add}" />
                             </DataTrigger>
 
                             <DataTrigger Binding="{Binding DiffChangeType}" Value="None">
-                                <Setter Property="Stroke" Value="{DynamicResource DiffChangeBackground}" />
+                                <Setter Property="Fill" Value="{DynamicResource GitHubDiffGlyphFill.None}" />
                             </DataTrigger>
 
                             <DataTrigger Binding="{Binding DiffChangeType}" Value="Delete">
-                                <Setter Property="Stroke" Value="{DynamicResource RemovedDiffChangeBackground}" />
+                                <Setter Property="Fill" Value="{DynamicResource GitHubDiffGlyphFill.Delete}" />
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
-                </Path.Style>
-            </Path>
+                </Canvas.Resources>
+            </Canvas>
         </Viewbox>
     </Grid>
 </UserControl>
diff --git a/src/GitHub.InlineReviews/Tags/InlineCommentGlyphFactory.cs b/src/GitHub.InlineReviews/Tags/InlineCommentGlyphFactory.cs
@@ -16,54 +16,13 @@ class InlineCommentGlyphFactory : IGlyphFactory<InlineCommentTag>
     {
         readonly IInlineCommentPeekService peekService;
         readonly ITextView textView;
-        readonly BrushesManager brushesManager;
 
         public InlineCommentGlyphFactory(
             IInlineCommentPeekService peekService,
-            ITextView textView,
-            IEditorFormatMap editorFormatMap)
+            ITextView textView)
         {
             this.peekService = peekService;
             this.textView = textView;
-
-            brushesManager = new BrushesManager(editorFormatMap);
-        }
-
-        class BrushesManager
-        {
-            const string AddPropertiesKey = "deltadiff.add.word";
-            const string DeletePropertiesKey = "deltadiff.remove.word";
-            const string NonePropertiesKey = "Indicator Margin";
-
-            readonly ResourceDictionary addProperties;
-            readonly ResourceDictionary deleteProperties;
-            readonly ResourceDictionary noneProperties;
-
-            internal BrushesManager(IEditorFormatMap editorFormatMap)
-            {
-                addProperties = editorFormatMap.GetProperties(AddPropertiesKey);
-                deleteProperties = editorFormatMap.GetProperties(DeletePropertiesKey);
-                noneProperties = editorFormatMap.GetProperties(NonePropertiesKey);
-            }
-
-            internal Brush GetBackground(DiffChangeType diffChangeType)
-            {
-                switch (diffChangeType)
-                {
-                    case DiffChangeType.Add:
-                        return GetBackground(addProperties);
-                    case DiffChangeType.Delete:
-                        return GetBackground(deleteProperties);
-                    case DiffChangeType.None:
-                    default:
-                        return GetBackground(noneProperties);
-                }
-            }
-
-            static Brush GetBackground(ResourceDictionary dictionary)
-            {
-                return dictionary["Background"] as Brush;
-            }
         }
 
         public UIElement GenerateGlyph(IWpfTextViewLine line, InlineCommentTag tag)
@@ -76,7 +35,6 @@ public UIElement GenerateGlyph(IWpfTextViewLine line, InlineCommentTag tag)
                 if (OpenThreadView(tag)) e.Handled = true;
             };
 
-            glyph.Resources["DiffChangeBackground"] = brushesManager.GetBackground(tag.DiffChangeType);
             return glyph;
         }
 

diff --git a/src/GitHub.InlineReviews/Tags/ShowInlineCommentGlyph.xaml b/src/GitHub.InlineReviews/Tags/ShowInlineCommentGlyph.xaml
@@ -3,22 +3,63 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:cache="clr-namespace:GitHub.UI.Helpers;assembly=GitHub.UI"
              mc:Ignorable="d"
-             ToolTipService.ShowDuration="600000" ToolTipService.HasDropShadow="True">
+             ToolTipService.ShowDuration="600000">
 
-    <UserControl.Resources>
-        <!-- This will be the color of an added/deleted word in the diff view or the indicator margin color -->
-        <SolidColorBrush x:Key="DiffChangeBackground" Color="DarkSlateGray" />
-    </UserControl.Resources>
+    <!-- Resourcess are defined in \GitHub.VisualStudio.UI\Styles\Theme*.xaml (and Properties\DesignTimeResources.xaml) -->
+    <UserControl.Style>
+        <Style TargetType="UserControl">
+            <Style.Triggers>
+                <DataTrigger Binding="{Binding DiffChangeType}" Value="Add">
+                    <Setter Property="Background" Value="{DynamicResource GitHubDiffChangeBackground.Add}" />
+                </DataTrigger>
 
-    <UserControl.ToolTip>
-        <ToolTip x:Name="CommentToolTip" />
-    </UserControl.ToolTip>
+                <DataTrigger Binding="{Binding DiffChangeType}" Value="Delete">
+                    <Setter Property="Background" Value="{DynamicResource GitHubDiffChangeBackground.Delete}" />
+                </DataTrigger>
+
+                <DataTrigger Binding="{Binding DiffChangeType}" Value="None">
+                    <Setter Property="Background" Value="{DynamicResource GitHubDiffChangeBackground.None}" />
+                </DataTrigger>
+            </Style.Triggers>
+        </Style>
+    </UserControl.Style>
+
+    <Grid>
+        <Viewbox HorizontalAlignment="Center" VerticalAlignment="Center">
+            <Canvas Width="16" Height="15">
+                <Path Canvas.Top="1" Canvas.Left="0.85"
+                    Data="M1,0 C0.45,0 0,0.45 0,1 L0,9 C0,9.55 0.45,10 1,10 L3,10 L3,13.5 L6.5,10 L13,10 C13.55,10 14,9.55 14,9 L14,1 C14,0.45 13.55,0 13,0 L1,0 Z" />
+                <Path Canvas.Top="1" Canvas.Left="0.85" Opacity="0.163" Stroke="#313131" 
+                      Data="M3.5,12.2928932 L6.29289322,9.5 L13,9.5 C13.2738576,9.5 13.5,9.27385763 13.5,9 L13.5,1 C13.5,0.726142375 13.2738576,0.5 13,0.5 L1,0.5 C0.726142375,0.5 0.5,0.726142375 0.5,1 L0.5,9 C0.5,9.27385763 0.726142375,9.5 1,9.5 L3.5,9.5 L3.5,12.2928932 Z" />
+
+                <Canvas.Resources>
+                    <Style TargetType="Path">
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding DiffChangeType}" Value="Add">
+                                <Setter Property="Fill" Value="{DynamicResource GitHubDiffGlyphFill.Add}" />
+                            </DataTrigger>
 
-    <Grid Background="{DynamicResource DiffChangeBackground}">
-        <Viewbox>
-            <Path Stroke="Black"
-          Data="M13 2H1c-0.55 0-1 0.45-1 1v8c0 0.55 0.45 1 1 1h2v3.5l3.5-3.5h6.5c0.55 0 1-0.45 1-1V3c0-0.55-0.45-1-1-1z m0 9H6L4 13V11H1V3h12v8z"/>
+                            <DataTrigger Binding="{Binding DiffChangeType}" Value="None">
+                                <Setter Property="Fill" Value="{DynamicResource GitHubDiffGlyphFill.None}" />
+                            </DataTrigger>
+
+                            <DataTrigger Binding="{Binding DiffChangeType}" Value="Delete">
+                                <Setter Property="Fill" Value="{DynamicResource GitHubDiffGlyphFill.Delete}" />
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </Canvas.Resources>
+            </Canvas>
         </Viewbox>
     </Grid>
+
+    <UserControl.ToolTip>
+        <ToolTip
+            Background="{DynamicResource GitHubVsToolWindowBackground}"
+            Foreground="{DynamicResource GitHubVsToolWindowText}"
+            x:Name="CommentToolTip" />
+    </UserControl.ToolTip>
+
 </UserControl>
diff --git a/src/GitHub.InlineReviews/Views/CommentView.xaml b/src/GitHub.InlineReviews/Views/CommentView.xaml
@@ -75,18 +75,20 @@
                                     Account="{Binding User}"/>
 
             <StackPanel Margin="4 4" Orientation="Vertical" Grid.Column="1">
-                <Border Background="#FFF6F8FA" Padding="6 5" BorderThickness="1 1 1 0" BorderBrush="#FFD1D5DA" CornerRadius="2 2 0 0">
+                <Border Background="{DynamicResource GitHubVsBrandedUIBackground}" Padding="6 5" BorderThickness="1 1 1 0" BorderBrush="{DynamicResource GitHubVsBrandedUIBorder}" CornerRadius="2 2 0 0">
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Margin="2 0" FontWeight="Bold" Text="{Binding User.Login}"/>
+                        <TextBlock Foreground="{DynamicResource GitHubVsToolWindowText}" Margin="2 0" FontWeight="Bold" Text="{Binding User.Login}"/>
                         <ui:GitHubActionLink Content="{Binding UpdatedAt, Converter={ui:DurationToStringConverter}}"
                                              Command="{Binding OpenOnGitHub}"
-                                             Foreground="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TextBlock}, AncestorLevel=1}, Path=Foreground}"
+                                             Foreground="{DynamicResource GitHubVsToolWindowText}"
+                                             Opacity="0.75"
                                              Margin="2 0"/>
                     </StackPanel>
                 </Border>
 
-                <Border Background="White" Padding="6 5" BorderThickness="1" BorderBrush="#FFD1D5DA" CornerRadius="0 0 2 2 ">
+                <Border Background="{DynamicResource GitHubVsToolWindowBackground}" Padding="6 5" BorderThickness="1" BorderBrush="{DynamicResource GitHubVsBrandedUIBorder}" CornerRadius="0 0 2 2 ">
                     <ui:MarkdownViewer Grid.Column="1" Grid.Row="1" 
+                                   Foreground="{DynamicResource GitHubVsToolWindowText}"
                                    DocumentStyle="{StaticResource DocumentStyle}"
                                    RawContent="{Binding Body}"
                                    ScrollViewer.VerticalScrollBarVisibility="Auto"/>
@@ -140,14 +142,24 @@
                               GotFocus="ReplyPlaceholder_GotFocus">
                 <ui:PromptTextBox.Style>
                     <Style TargetType="ui:PromptTextBox" BasedOn="{StaticResource RoundedPromptTextBox}">
+                        <Setter Property="Foreground" Value="{DynamicResource GitHubVsToolWindowText}" />
+                        <Setter Property="Background" Value="{DynamicResource GitHubVsToolWindowBackground}" />
                         <Setter Property="Height" Value="28"/>
                         <Setter Property="PromptText" Value="Reply..."/>
+                        <Setter Property="BorderBrush" Value="{DynamicResource GitHubVsBrandedUIBorder}" />
+
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding EditState}" Value="Editing">
                                 <Setter Property="MinHeight" Value="100"/>
                                 <Setter Property="PromptText" Value="Leave a comment"/>
                             </DataTrigger>
                         </Style.Triggers>
+
+                        <Style.Resources>
+                            <Style TargetType="TextBlock">
+                                <Setter Property="Foreground" Value="{DynamicResource GitHubVsToolWindowText}" />
+                            </Style>
+                        </Style.Resources>
                     </Style>
                 </ui:PromptTextBox.Style>
             </ui:PromptTextBox>
@@ -171,7 +183,7 @@
 
             <StackPanel Name="buttonPanel"
                         Grid.Column="1" Grid.Row="2" 
-                        Margin="0 4" 
+                        Margin="4 8" 
                         HorizontalAlignment="Left"
                         Orientation="Horizontal"
                         IsVisibleChanged="buttonPanel_IsVisibleChanged">

diff --git a/src/GitHub.InlineReviews/Views/GlyphMarginGrid.xaml b/src/GitHub.InlineReviews/Views/GlyphMarginGrid.xaml
@@ -4,67 +4,17 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:GitHub.InlineReviews.Views"
+             xmlns:cache="clr-namespace:GitHub.UI.Helpers;assembly=GitHub.UI"
              mc:Ignorable="d" 
+             Background="{DynamicResource VsBrush.Window}"
              d:DesignHeight="100" Width="17">
+    <Grid.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Grid.Resources>
 
-    <Grid.Background>
-
-        <VisualBrush TileMode="Tile" Viewport="0,0,5,5" ViewportUnits="Absolute" Viewbox="0,0,15,15" ViewboxUnits="Absolute">
-            <VisualBrush.Visual>
-                <Grid>
-                    <Path Data="M 0 15 L 15 0" Stroke="Black" />
-                </Grid>
-            </VisualBrush.Visual>
-        </VisualBrush>
-
-        <!-- NOTE: We should really use a DrawingBrush not a VisualBrush, e.g. -->
-        <!--
-        <DrawingBrush Stretch="UniformToFill" ViewportUnits="Absolute" Viewport="0,0,10,10" TileMode="Tile">
-            <DrawingBrush.Drawing>
-                <DrawingGroup>
-                    <DrawingGroup.Children>
-                        <GeometryDrawing Brush="Black">
-                            <GeometryDrawing.Geometry>
-                                <GeometryGroup FillRule="Nonzero">
-                                    <PathGeometry>
-                                        <PathFigure StartPoint="0,0">
-                                            <LineSegment  Point="100,0"/>
-                                            <LineSegment  Point="100,100"/>
-                                            <LineSegment  Point="0,100"/>
-                                        </PathFigure>
-                                    </PathGeometry>
-                                </GeometryGroup>
-                            </GeometryDrawing.Geometry>
-                        </GeometryDrawing>
-                        <GeometryDrawing Brush="#FF404040">
-                            <GeometryDrawing.Geometry>
-                                <GeometryGroup FillRule="Nonzero">
-                                    <PathGeometry>
-                                        <PathFigure StartPoint="0,0">
-                                            <LineSegment  Point="25,0"/>
-                                            <LineSegment  Point="100,75"/>
-                                            <LineSegment  Point="100,100"/>
-                                            <LineSegment  Point="75,100"/>
-                                            <LineSegment  Point="0,25"/>
-                                            <LineSegment  Point="0,0"/>
-                                        </PathFigure>
-                                        <PathFigure StartPoint="75,0">
-                                            <LineSegment  Point="100,25"/>
-                                            <LineSegment  Point="100,0"/>
-                                        </PathFigure>
-                                        <PathFigure StartPoint="0,75">
-                                            <LineSegment  Point="25,100"/>
-                                            <LineSegment  Point="0,100"/>
-                                        </PathFigure>
-                                    </PathGeometry>
-                                </GeometryGroup>
-                            </GeometryDrawing.Geometry>
-                        </GeometryDrawing>
-                    </DrawingGroup.Children>
-                </DrawingGroup>
-            </DrawingBrush.Drawing>
-        </DrawingBrush>
-        -->
-
-    </Grid.Background>
+    <Border BorderBrush="{DynamicResource VsBrush.ScrollBarBackground}" BorderThickness="0,0,1,0"/>
 </Grid>