Fix textviewer highlighting

r37r0m0d3l · Nov 23, 2022 · 7b5b01a · 7b5b01a
1 parent b80c264
commit 7b5b01a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/QuickLook.Plugin/QuickLook.Plugin.TextViewer/Plugin.cs b/QuickLook.Plugin/QuickLook.Plugin.TextViewer/Plugin.cs
@@ -128,7 +128,7 @@ private HighlightingManager getHighlightingManager(Themes theme, string dirName)
             if (!Directory.Exists(syntaxPath))
                 return hlm;
 
-            foreach (var file in Directory.EnumerateFiles(syntaxPath, "*.xshd"))
+            foreach (var file in Directory.EnumerateFiles(syntaxPath, "*.xshd").OrderBy(f => f))
             {
                 Debug.WriteLine(file);
                 var ext = Path.GetFileNameWithoutExtension(file);
@@ -146,7 +146,8 @@ private HighlightingManager getHighlightingManager(Themes theme, string dirName)
         }
         private void AssignHighlightingManager(TextViewerPanel tvp, ContextObject context)
         {
-            var isDark = (context.Theme == Themes.Dark) | OSThemeHelper.AppsUseDarkTheme() | false;
+            var darkThemeAllowed = SettingHelper.Get("AllowDarkTheme", false, "QuickLook.Plugin.TextViewer");
+            var isDark = darkThemeAllowed && OSThemeHelper.AppsUseDarkTheme();
             tvp.HighlightingManager = isDark ? _hlmDark : _hlmLight;
         }
     }

diff --git a/QuickLook.Plugin/QuickLook.Plugin.TextViewer/QuickLook.Plugin.TextViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.TextViewer/QuickLook.Plugin.TextViewer.csproj
@@ -89,7 +89,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Syntax\**">
-      <CopyToOutputDirectory>None</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <None Include="app.config" />
     <None Include="packages.config" />

diff --git a/....Plugin.TextViewer/Syntax/Light/HTML.xshd → ...ntax/Light/zzz-After-JavaScript-HTML.xshd b/....Plugin.TextViewer/Syntax/Light/HTML.xshd → ...ntax/Light/zzz-After-JavaScript-HTML.xshd
diff --git a/QuickLook.Plugin/QuickLook.Plugin.TextViewer/TextViewerPanel.cs b/QuickLook.Plugin/QuickLook.Plugin.TextViewer/TextViewerPanel.cs
@@ -45,8 +45,9 @@ public TextViewerPanel(string path, ContextObject context)
         {
             _context = context;
 
-            SetResourceReference(Control.ForegroundProperty, "WindowTextForeground");
-            Background = Brushes.Transparent;
+            Background = OSThemeHelper.AppsUseDarkTheme()
+                ? new SolidColorBrush(Color.FromArgb(150, 255, 255, 255))
+                : Brushes.Transparent;
             FontSize = 14;
             ShowLineNumbers = true;
             WordWrap = true;

diff --git a/Scripts/pack-appx.ps1 b/Scripts/pack-appx.ps1
@@ -24,11 +24,11 @@ if(-not (Test-Path env:CI))
     Update-Version("..\Build\Appx\AppxManifest.xml")
 
     # generate resources
-    $priExe = 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86\makepri.exe'
+    $priExe = 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86\makepri.exe'
     .$priExe new /pr ..\Build\Appx /cf ..\Build\priconfig.xml /of ..\Build\Appx\resources.pri
 
     # packing
-    $packExe = 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86\makeappx.exe'
+    $packExe = 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86\makeappx.exe'
     $folder = '..\Build\Appx\'
 
     .$packExe pack /l /o /d ..\Build\Appx /p ..\Build\QuickLook-$version.appx