Skip to content

Change default background for Match Margin #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DaPa wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Change default background for Match Margin #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a04b6b5
get build running with vs 2019
DaPa Sep 29, 2019
47f7743
better default background color for dark theme in output window
DaPa Sep 29, 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
214 changes: 107 additions & 107 deletions src/MatchMargin/MatchMargin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,109 +1,109 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(_NTDRIVE)$(_NTROOT)\tools\Microsoft.DevDiv.Settings.targets" Condition="'$(RazzleToolPath)'!=''" />
<Import Project="..\ProPowerTools.Settings.targets" />
<PropertyGroup>
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProjectGuid>{4133D566-F45A-4E14-94E1-305E244A8671}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.VisualStudio.PowerTools.MatchMargin</RootNamespace>
<AssemblyName>Microsoft.VisualStudio.PowerTools.MatchMargin</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<GeneratePkgDefFile>false</GeneratePkgDefFile>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>4.0</OldToolsVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition="'$(RazzleBuild)' == '' and '$(ProPowerToolsPackage)' == ''">
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(_NTDRIVE)$(_NTROOT)\tools\Microsoft.DevDiv.Settings.targets" Condition="'$(RazzleToolPath)'!=''" />
<Import Project="..\ProPowerTools.Settings.targets" />
<PropertyGroup>
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProjectGuid>{4133D566-F45A-4E14-94E1-305E244A8671}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.VisualStudio.PowerTools.MatchMargin</RootNamespace>
<AssemblyName>Microsoft.VisualStudio.PowerTools.MatchMargin</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<GeneratePkgDefFile>false</GeneratePkgDefFile>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>4.0</OldToolsVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition="'$(RazzleBuild)' == '' and '$(ProPowerToolsPackage)' == ''">
<!-- We only want to deploy the package if we're being built in Visual Studio (not in Razzle),
and if we're being built standalone (not as a part of the Pro Power Tools package). -->
<CreateVsixContainer>true</CreateVsixContainer>
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
<DeployExtension>true</DeployExtension>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.CoreUtility">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Microsoft.VisualStudio.Text.Data">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Microsoft.VisualStudio.Text.Logic">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Microsoft.VisualStudio.Text.UI">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Microsoft.VisualStudio.Text.UI.Wpf">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="PresentationCore">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="PresentationFramework">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="System">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="System.ComponentModel.Composition">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="System.Core">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="System.Xaml">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="WindowsBase">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MatchMargin.cs" />
<Compile Include="MatchMarginElement.cs" />
<Compile Include="MatchMarginFactory.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Content Include="MatchMarginColors.pkgdef">
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<EmbeddedResource Include="Strings.resx">
<SubType>Designer</SubType>
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
</EmbeddedResource>
<Compile Include="Strings.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Strings.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="source.extension.vsixmanifest">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<Import Project="$(_NTDRIVE)$(_NTROOT)\tools\Microsoft.DevDiv.targets" Condition="'$(RazzleToolPath)'!=''" />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(RazzleBuild)'==''" />
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" />
and if we're being built standalone (not as a part of the Pro Power Tools package). -->
<CreateVsixContainer>true</CreateVsixContainer>
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
<DeployExtension>true</DeployExtension>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.CoreUtility">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Microsoft.VisualStudio.Text.Data">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Microsoft.VisualStudio.Text.Logic">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Microsoft.VisualStudio.Text.UI">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Microsoft.VisualStudio.Text.UI.Wpf">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="PresentationCore">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="PresentationFramework">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="System">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="System.ComponentModel.Composition">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="System.Core">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="System.Xaml">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="WindowsBase">
<Private>False</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MatchMargin.cs" />
<Compile Include="MatchMarginElement.cs" />
<Compile Include="MatchMarginFactory.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Content Include="MatchMarginColors.pkgdef">
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<EmbeddedResource Include="Strings.resx">
<SubType>Designer</SubType>
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
</EmbeddedResource>
<Compile Include="Strings.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Strings.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="source.extension.vsixmanifest">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<Import Project="$(_NTDRIVE)$(_NTROOT)\tools\Microsoft.DevDiv.targets" Condition="'$(RazzleToolPath)'!=''" />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(RazzleBuild)'==''" />
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" />
</Project>
2 changes: 1 addition & 1 deletion src/MatchMargin/MatchMarginElement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public MatchColorFormat()
{
this.DisplayName = Strings.MatchColor;
this.ForegroundColor = Color.FromRgb(147, 112, 219); //Color of the margin mark
this.BackgroundColor = Color.FromRgb(228, 219, 246); //Color of the adornment
this.BackgroundColor = Color.FromRgb(103, 109, 91); //Color of the adornment. Old: (228, 219, 246);
}
}

Expand Down
Binary file modified src/MatchMargin/Strings.Designer.cs
View file
Open in desktop
Binary file not shown.
31 changes: 17 additions & 14 deletions src/MatchMargin/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="MatchMargin.Microsoft Corp..42825e7b-83aa-4d8e-9c5d-db53c7b6ff31" Version="1.0" Language="en-US" Publisher="David Pugh" />
<DisplayName>Match Margin</DisplayName>
<Description xml:space="preserve">This extension draws matchs that match the word under the caret in the scroll bar and in the editor.</Description>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0,15.0]" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="4.5" />
</Dependencies>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
</Assets>
<Metadata>
<Identity Id="MatchMargin.Microsoft Corp..42825e7b-83aa-4d8e-9c5d-db53c7b6ff31" Version="1.0" Language="en-US" Publisher="David Pugh" />
<DisplayName>Match Margin</DisplayName>
<Description xml:space="preserve">This extension draws matchs that match the word under the caret in the scroll bar and in the editor.</Description>
</Metadata>
<Installation>
<InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Community" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="4.5" />
</Dependencies>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
</Assets>
<Prerequisites>
<Prerequisite DisplayName="Visual Studio extension development prerequisites" Version="[16.3.29230.54,17.0)" Id="Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites" />
</Prerequisites>
</PackageManifest>