Skip to content

Commit 0a29335

Browse files
committed
remove border #146
1 parent be31b36 commit 0a29335

File tree

6 files changed

+24
-18
lines changed

6 files changed

+24
-18
lines changed

.github/workflows/workflow.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,9 @@ jobs:
9494
personal-access-code: ${{ secrets.VS_PUBLISHER_ACCESS_TOKEN }}
9595

9696
- name: Publish to Open VSIX Gallery - VS2019
97-
uses: leandro-hermes/action-upload-file@v1.1.0
98-
with:
99-
host: 'www.vsixgallery.com'
100-
path: '/api/upload?repo=${{ env.repoUrl }}&issuetracker=${{ env.repoUrl }}/issues'
101-
https: true
102-
filePath: CodeNav/CodeNav.VS2019/bin/release/CodeNav.VS2019.vsix
97+
run: |
98+
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"'
10399
104100
- name: Publish to Open VSIX Gallery - VS2022
105-
uses: leandro-hermes/action-upload-file@v1.1.0
106-
with:
107-
host: 'www.vsixgallery.com'
108-
path: '/api/upload?repo=${{ env.repoUrl }}&issuetracker=${{ env.repoUrl }}/issues'
109-
https: true
110-
filePath: CodeNav/CodeNav.VS2022/bin/release/CodeNav.VS2022.vsix
101+
run: |
102+
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"'

CodeNav.Shared/Controls/ClassDataTemplate.xaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:models="clr-namespace:CodeNav.Models"
4-
xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging">
4+
xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
5+
xmlns:vsShell="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0">
56

67
<ResourceDictionary.MergedDictionaries>
78
<ResourceDictionary Source="../Styles/PlusMinusExpanderStyles.xaml" />
@@ -44,6 +45,9 @@
4445
<Trigger Property="IsMouseOver" Value="True">
4546
<Setter TargetName="Expander" Property="BorderBrush" Value="SteelBlue"/>
4647
</Trigger>
48+
<Trigger Property="IsMouseOver" Value="False">
49+
<Setter TargetName="Expander" Property="BorderBrush" Value="{DynamicResource {x:Static vsShell:EnvironmentColors.ToolWindowBorderBrushKey}}"/>
50+
</Trigger>
4751
</DataTemplate.Triggers>
4852
</DataTemplate>
4953

CodeNav.Shared/Controls/FilterToolbar.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
Background="Transparent"
2525
Text="{Binding FilterText, Mode=TwoWay}"
2626
Foreground="{DynamicResource {x:Static platformUI:EnvironmentColors.ToolWindowTextBrushKey}}"
27-
CaretBrush="{DynamicResource {x:Static platformUI:EnvironmentColors.ToolWindowTextBrushKey}}"/>
27+
CaretBrush="{DynamicResource {x:Static platformUI:EnvironmentColors.ToolWindowTextBrushKey}}"
28+
BorderBrush="{DynamicResource {x:Static platformUI:EnvironmentColors.ToolWindowBorderBrushKey}}"/>
2829
<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">
2930
<TextBlock.Style>
3031
<Style TargetType="{x:Type TextBlock}">

CodeNav.Shared/Controls/NamespaceDataTemplate.xaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:models="clr-namespace:CodeNav.Models"
4-
xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging">
4+
xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
5+
xmlns:vsShell="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0">
56

67
<ResourceDictionary.MergedDictionaries>
78
<ResourceDictionary Source="../Styles/PlusMinusExpanderStyles.xaml" />
@@ -57,6 +58,9 @@
5758
<Trigger Property="IsMouseOver" Value="True">
5859
<Setter TargetName="Expander" Property="BorderBrush" Value="SteelBlue"/>
5960
</Trigger>
61+
<Trigger Property="IsMouseOver" Value="False">
62+
<Setter TargetName="Expander" Property="BorderBrush" Value="{DynamicResource {x:Static vsShell:EnvironmentColors.ToolWindowBorderBrushKey}}"/>
63+
</Trigger>
6064
</DataTemplate.Triggers>
6165
</DataTemplate>
6266

CodeNav.Shared/Styles/PlusMinusExpanderStyles.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
4-
xmlns:catalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog">
4+
xmlns:catalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
5+
xmlns:vsShell="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0">
56

67
<ResourceDictionary.MergedDictionaries>
78
<ResourceDictionary Source="../Menus/ItemContextMenu.xaml"/>
@@ -64,8 +65,7 @@
6465
<Border BorderThickness="0" x:Name="ExpanderHeaderBorder">
6566
<Border.BorderBrush>
6667
<LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
67-
<GradientStop Color="DarkGray" Offset="0.0" />
68-
<GradientStop Color="LightGray" Offset="0.5" />
68+
<GradientStop Color="{DynamicResource {x:Static vsShell:EnvironmentColors.ToolWindowBorderColorKey}}" Offset="0.0" />
6969
<GradientStop Color="Transparent" Offset="1" />
7070
</LinearGradientBrush>
7171
</Border.BorderBrush>

CodeNav.Tests/Files/TestRegions.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ public void OutsideRegionFunction()
5050
public void SiblingRegionFunction()
5151
{
5252

53+
}
54+
55+
void _MethodWithoutAccessModifier()
56+
{
57+
5358
}
5459
#endregion
5560
}

0 commit comments

Comments
 (0)