Version 6.3

wmjordan · Jun 2, 2022 · 0957905 · 0957905
1 parent bb5cfac
commit 0957905
Show file tree

Hide file tree

Showing 7 changed files with 226 additions and 213 deletions.
diff --git a/Codist/Config.cs b/Codist/Config.cs
@@ -16,7 +16,7 @@ namespace Codist
 {
 	sealed class Config
 	{
-		internal const string CurrentVersion = "6.2.0";
+		internal const string CurrentVersion = "6.3.0";
 		const string ThemePrefix = "res:";
 		const int DefaultIconSize = 20;
 		internal const string LightTheme = ThemePrefix + "Light", PaleLightTheme = ThemePrefix + "PaleLight", DarkTheme = ThemePrefix + "Dark", PaleDarkTheme = ThemePrefix + "PaleDark", SimpleTheme = ThemePrefix + "Simple";

diff --git a/Codist/Helpers/WpfHelper.cs b/Codist/Helpers/WpfHelper.cs
@@ -690,6 +690,7 @@ static InstalledFont[] Init() {
 	sealed class InstalledFont
 	{
 		internal static readonly string SystemLang = System.Globalization.CultureInfo.CurrentCulture.IetfLanguageTag;
+		FamilyTypeface[] _ExtraTypefaces;
 
 		public InstalledFont(FontFamily font) {
 			Font = font;
@@ -702,13 +703,11 @@ public InstalledFont(FontFamily font) {
 			if (Name == null) {
 				Name = Font.Source;
 			}
-			//ExtraTypefaces = font.FamilyTypefaces
-			//	.Where(i => i.IsStandardStyle() == false)
-			//	.ToArray();
 		}
 		public FontFamily Font { get; }
 		public string Name { get; }
-		//public FamilyTypeface[] ExtraTypefaces { get; }
+		public FamilyTypeface[] ExtraTypefaces => _ExtraTypefaces ?? (_ExtraTypefaces = Font.FamilyTypefaces.Where(i => i.IsStandardStyle() == false).ToArray());
+
 		public override string ToString() {
 			return Name;
 		}

diff --git a/Codist/Options/OptionsPage.cs b/Codist/Options/OptionsPage.cs
@@ -40,7 +40,7 @@ void LoadConfig(Config config) {
 		protected override void OnActivate(CancelEventArgs e) {
 			base.OnActivate(e);
 			if (Feature != Features.None && Control != null) {
-				Control.IsEnabled = Config.Instance.Features.MatchFlags(Feature);
+				Control.IsEnabled = Config.Instance.Features.HasAnyFlag(Feature);
 			}
 			Config.Instance.BeginUpdate();
 		}
@@ -934,7 +934,7 @@ sealed class WebSearchPage : OptionsPage
 	{
 		UIElement _Child;
 
-		protected override Features Feature => Features.None;
+		protected override Features Feature => Features.SmartBar | Features.SuperQuickInfo;
 		protected override UIElement Child => _Child ?? (_Child = new PageControl(this));
 
 		sealed class PageControl : OptionsPageContainer

diff --git a/Codist/Properties/AssemblyInfo.cs b/Codist/Properties/AssemblyInfo.cs
@@ -11,5 +11,5 @@
 [assembly: AssemblyTrademark(nameof(Codist))]
 [assembly: ComVisible(false)]
 [assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.2.0.7100")]
+[assembly: AssemblyFileVersion("6.3.0.7300")]
 [assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
diff --git a/Codist/source.extension.vsixmanifest b/Codist/source.extension.vsixmanifest
@@ -1,46 +1,46 @@
 <?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="Codist.WMJ.c7b93d20-621f-4b21-9d28-d51157ef0b94" Version="6.2.0.7176" Language="en-US" Publisher="WMJ" />
-        <DisplayName>Codist</DisplayName>
-        <Description xml:space="preserve">A C# programmer's productivity booster which enhances syntax highlighting, quick info (tooltip), navigation bar, scrollbar, display quality, automatically updated version numbers, and brings smart tool bar to code editor.</Description>
-        <MoreInfo>https://github.com/wmjordan/Codist</MoreInfo>
-        <License>license.txt</License>
-        <ReleaseNotes>https://github.com/wmjordan/Codist/releases</ReleaseNotes>
-        <Icon>icon.png</Icon>
-        <PreviewImage>preview.png</PreviewImage>
-        <Tags>coding; programming; productivity; syntax highlight; quick info; reference analysis; code analysis; navigation; comment; tag; line number; scrollbar; line height; assembly version; C#; C; C++; html; markdown</Tags>
-    </Metadata>
-    <Installation>
-        <InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Pro">
-            <ProductArchitecture>x86</ProductArchitecture>
-        </InstallationTarget>
-        <InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Community">
-            <ProductArchitecture>x86</ProductArchitecture>
-        </InstallationTarget>
-        <InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Enterprise">
-            <ProductArchitecture>x86</ProductArchitecture>
-        </InstallationTarget>
-        <InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Pro">
-            <ProductArchitecture>amd64</ProductArchitecture>
-        </InstallationTarget>
-        <InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Community">
-            <ProductArchitecture>amd64</ProductArchitecture>
-        </InstallationTarget>
-        <InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Enterprise">
-            <ProductArchitecture>amd64</ProductArchitecture>
-        </InstallationTarget>
-    </Installation>
-    <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,18.0)" DisplayName="Visual Studio core editor" />
-        <Prerequisite Id="Microsoft.VisualStudio.Component.Roslyn.LanguageServices" Version="[15.0,18.0)" DisplayName="C# and Visual Basic" />
-        <Prerequisite Id="Microsoft.VisualStudio.Component.Roslyn.Compiler" Version="[15.0,18.0)" DisplayName="C# and Visual Basic Roslyn Compiler" />
-    </Prerequisites>
-    <Assets>
-        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
-        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
-        <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
-    </Assets>
+  <Metadata>
+    <Identity Id="Codist.WMJ.c7b93d20-621f-4b21-9d28-d51157ef0b94" Version="6.3.0.7299" Language="en-US" Publisher="WMJ" />
+    <DisplayName>Codist</DisplayName>
+    <Description xml:space="preserve">A C# programmer's productivity booster which enhances syntax highlighting, quick info (tooltip), navigation bar, scrollbar, display quality, automatically updated version numbers, and brings smart tool bar to code editor.</Description>
+    <MoreInfo>https://github.com/wmjordan/Codist</MoreInfo>
+    <License>license.txt</License>
+    <ReleaseNotes>https://github.com/wmjordan/Codist/releases</ReleaseNotes>
+    <Icon>icon.png</Icon>
+    <PreviewImage>preview.png</PreviewImage>
+    <Tags>coding; programming; productivity; syntax highlight; quick info; reference analysis; code analysis; navigation; comment; tag; line number; scrollbar; line height; assembly version; C#; C; C++; html; markdown</Tags>
+  </Metadata>
+  <Installation>
+    <InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Pro">
+      <ProductArchitecture>x86</ProductArchitecture>
+    </InstallationTarget>
+    <InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Community">
+      <ProductArchitecture>x86</ProductArchitecture>
+    </InstallationTarget>
+    <InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Enterprise">
+      <ProductArchitecture>x86</ProductArchitecture>
+    </InstallationTarget>
+    <InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Pro">
+      <ProductArchitecture>amd64</ProductArchitecture>
+    </InstallationTarget>
+    <InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Community">
+      <ProductArchitecture>amd64</ProductArchitecture>
+    </InstallationTarget>
+    <InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Enterprise">
+      <ProductArchitecture>amd64</ProductArchitecture>
+    </InstallationTarget>
+  </Installation>
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,18.0)" DisplayName="Visual Studio core editor" />
+    <Prerequisite Id="Microsoft.VisualStudio.Component.Roslyn.LanguageServices" Version="[15.0,18.0)" DisplayName="C# and Visual Basic" />
+    <Prerequisite Id="Microsoft.VisualStudio.Component.Roslyn.Compiler" Version="[15.0,18.0)" DisplayName="C# and Visual Basic Roslyn Compiler" />
+  </Prerequisites>
+  <Assets>
+    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
+    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
+    <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
+  </Assets>
 </PackageManifest>
 <!--
     Please add the following element to PackageManifest\\Assets: