remove border #146

sboulema · Mar 4, 2024 · 0a29335 · 0a29335
1 parent be31b36
commit 0a29335
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 18 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -94,17 +94,9 @@ jobs:
           personal-access-code: ${{ secrets.VS_PUBLISHER_ACCESS_TOKEN }}
 
       - name: Publish to Open VSIX Gallery - VS2019
-        uses: leandro-hermes/action-upload-file@v1.1.0
-        with:
-          host: 'www.vsixgallery.com'
-          path: '/api/upload?repo=${{ env.repoUrl }}&issuetracker=${{ env.repoUrl }}/issues'
-          https: true 
-          filePath: CodeNav/CodeNav.VS2019/bin/release/CodeNav.VS2019.vsix
+        run: |
+           curl -L 'https://www.vsixgallery.com/api/upload?repo=${{ env.repoUrl }}&issuetracker=${{ env.repoUrl }}/issues' -F 'file=@"CodeNav/CodeNav.VS2022/bin/release/CodeNav.VS2019.vsix"'
 
       - name: Publish to Open VSIX Gallery - VS2022
-        uses: leandro-hermes/action-upload-file@v1.1.0
-        with:
-          host: 'www.vsixgallery.com'
-          path: '/api/upload?repo=${{ env.repoUrl }}&issuetracker=${{ env.repoUrl }}/issues'
-          https: true 
-          filePath: CodeNav/CodeNav.VS2022/bin/release/CodeNav.VS2022.vsix
+        run: |
+           curl -L 'https://www.vsixgallery.com/api/upload?repo=${{ env.repoUrl }}&issuetracker=${{ env.repoUrl }}/issues' -F 'file=@"CodeNav/CodeNav.VS2022/bin/release/CodeNav.VS2022.vsix"'
diff --git a/CodeNav.Shared/Controls/ClassDataTemplate.xaml b/CodeNav.Shared/Controls/ClassDataTemplate.xaml
@@ -1,7 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:models="clr-namespace:CodeNav.Models"
-                    xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging">
+                    xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
+                    xmlns:vsShell="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Styles/PlusMinusExpanderStyles.xaml" />
@@ -44,6 +45,9 @@
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter TargetName="Expander" Property="BorderBrush" Value="SteelBlue"/>
             </Trigger>
+            <Trigger Property="IsMouseOver" Value="False">
+                <Setter TargetName="Expander" Property="BorderBrush" Value="{DynamicResource {x:Static vsShell:EnvironmentColors.ToolWindowBorderBrushKey}}"/>
+            </Trigger>
         </DataTemplate.Triggers>
     </DataTemplate>
 

diff --git a/CodeNav.Shared/Controls/FilterToolbar.xaml b/CodeNav.Shared/Controls/FilterToolbar.xaml
@@ -24,7 +24,8 @@
                      Background="Transparent"
                      Text="{Binding FilterText, Mode=TwoWay}"
                      Foreground="{DynamicResource {x:Static platformUI:EnvironmentColors.ToolWindowTextBrushKey}}" 
-                     CaretBrush="{DynamicResource {x:Static platformUI:EnvironmentColors.ToolWindowTextBrushKey}}"/>
+                     CaretBrush="{DynamicResource {x:Static platformUI:EnvironmentColors.ToolWindowTextBrushKey}}"
+                     BorderBrush="{DynamicResource {x:Static platformUI:EnvironmentColors.ToolWindowBorderBrushKey}}"/>
             <TextBlock IsHitTestVisible="False" Text="Enter text to filter by..." VerticalAlignment="Center" HorizontalAlignment="Left" Margin="10,0,0,0" Padding="0,0,10,0" Foreground="DarkGray">
                 <TextBlock.Style>
                     <Style TargetType="{x:Type TextBlock}">

diff --git a/CodeNav.Shared/Controls/NamespaceDataTemplate.xaml b/CodeNav.Shared/Controls/NamespaceDataTemplate.xaml
@@ -1,7 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:models="clr-namespace:CodeNav.Models"
-                    xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging">
+                    xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
+                    xmlns:vsShell="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Styles/PlusMinusExpanderStyles.xaml" />
@@ -57,6 +58,9 @@
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter TargetName="Expander" Property="BorderBrush" Value="SteelBlue"/>
             </Trigger>
+            <Trigger Property="IsMouseOver" Value="False">
+                <Setter TargetName="Expander" Property="BorderBrush" Value="{DynamicResource {x:Static vsShell:EnvironmentColors.ToolWindowBorderBrushKey}}"/>
+            </Trigger>
         </DataTemplate.Triggers>
     </DataTemplate>
 

diff --git a/CodeNav.Shared/Styles/PlusMinusExpanderStyles.xaml b/CodeNav.Shared/Styles/PlusMinusExpanderStyles.xaml
@@ -1,7 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
-                    xmlns:catalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog">
+                    xmlns:catalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
+                    xmlns:vsShell="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Menus/ItemContextMenu.xaml"/>
@@ -64,8 +65,7 @@
                                 <Border BorderThickness="0" x:Name="ExpanderHeaderBorder">
                                     <Border.BorderBrush>
                                         <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
-                                            <GradientStop Color="DarkGray" Offset="0.0" />
-                                            <GradientStop Color="LightGray" Offset="0.5" />
+                                            <GradientStop Color="{DynamicResource {x:Static vsShell:EnvironmentColors.ToolWindowBorderColorKey}}" Offset="0.0" />
                                             <GradientStop Color="Transparent" Offset="1" />
                                         </LinearGradientBrush>
                                     </Border.BorderBrush>

diff --git a/CodeNav.Tests/Files/TestRegions.cs b/CodeNav.Tests/Files/TestRegions.cs
@@ -50,6 +50,11 @@ public void OutsideRegionFunction()
         public void SiblingRegionFunction()
         {
 
+        }
+
+        void _MethodWithoutAccessModifier()
+        {
+
         }
         #endregion
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,6 +50,11 @@ public void OutsideRegionFunction() @@
             public void SiblingRegionFunction()
             {
+            }
+            void _MethodWithoutAccessModifier()
+            {
             }
             #endregion
         }
@@ Expand Down @@