Skip to content

Commit 9327382

Browse files
committed
Improve dark mode text preview
1 parent bfa28fc commit 9327382

File tree

6 files changed

+80
-224
lines changed

6 files changed

+80
-224
lines changed

QuickLook.Plugin/QuickLook.Plugin.TextViewer/Plugin.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void View(string path, ContextObject context)
9595
else
9696
{
9797
_tvp = new TextViewerPanel(path, context);
98-
AssignHighlightingManager(_tvp, context);
98+
AssignHighlightingManager(path, _tvp, context);
9999

100100
context.ViewerContent = _tvp;
101101
}
@@ -146,10 +146,12 @@ private HighlightingManager getHighlightingManager(Themes theme, string dirName)
146146
return hlm;
147147
}
148148

149-
private void AssignHighlightingManager(TextViewerPanel tvp, ContextObject context)
149+
private void AssignHighlightingManager(string path, TextViewerPanel tvp, ContextObject context)
150150
{
151-
var darkThemeAllowed = SettingHelper.Get("AllowDarkTheme", false, "QuickLook.Plugin.TextViewer");
151+
var def = _hlmDark.GetDefinitionByExtension(Path.GetExtension(path));
152+
var darkThemeAllowed = SettingHelper.Get("AllowDarkTheme", def != null, "QuickLook.Plugin.TextViewer");
152153
var isDark = darkThemeAllowed && OSThemeHelper.AppsUseDarkTheme();
154+
153155
tvp.HighlightingManager = isDark ? _hlmDark : _hlmLight;
154156
if (isDark)
155157
{
@@ -160,7 +162,7 @@ private void AssignHighlightingManager(TextViewerPanel tvp, ContextObject contex
160162
{
161163
// if os dark mode, but not AllowDarkTheme, make background light
162164
tvp.Background = OSThemeHelper.AppsUseDarkTheme()
163-
? new SolidColorBrush(Color.FromArgb(150, 255, 255, 255))
165+
? new SolidColorBrush(Color.FromArgb(175, 255, 255, 255))
164166
: Brushes.Transparent;
165167
}
166168
}

QuickLook.Plugin/QuickLook.Plugin.TextViewer/Syntax/Dark/.gitkeep

Whitespace-only changes.
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
3+
<SyntaxDefinition name="Json" extensions=".json" xmlns="http://icsharpcode.net/sharpdevelop/syntaxdefinition/2008">
4+
<Color name="Bool" foreground="#569CD6" exampleText="true | false" />
5+
<Color name="Number" foreground="#B5CEA8" exampleText="3.14" />
6+
<Color name="String" foreground="#CE9178" exampleText="" />
7+
<Color name="Null" foreground="#569CD6" exampleText="" />
8+
<Color name="FieldName" foreground="#9CDCF0" />
9+
<Color name="Punctuation1" foreground="#DA66BE" />
10+
<Color name="Punctuation2" foreground="#FFD710" />
11+
<Color name="Punctuation3" foreground="#FFFFFF" />
12+
13+
<RuleSet name="String">
14+
<Span begin="\\" end="."/>
15+
</RuleSet>
16+
17+
<RuleSet name="Object">
18+
<Span color="FieldName" ruleSet="String">
19+
<Begin>"</Begin>
20+
<End>"</End>
21+
</Span>
22+
<Span color="FieldName" ruleSet="String">
23+
<Begin>'</Begin>
24+
<End>'</End>
25+
</Span>
26+
<Span color="Punctuation3" ruleSet="Expression">
27+
<Begin>:</Begin>
28+
</Span>
29+
<Span color="Punctuation3">
30+
<Begin>,</Begin>
31+
</Span>
32+
</RuleSet>
33+
34+
<RuleSet name="Array">
35+
<Import ruleSet="Expression"/>
36+
<Span color="Punctuation3">
37+
<Begin>,</Begin>
38+
</Span>
39+
</RuleSet>
40+
41+
<RuleSet name="Expression">
42+
<Keywords color="Bool" >
43+
<Word>true</Word>
44+
<Word>false</Word>
45+
</Keywords>
46+
<Keywords color="Null" >
47+
<Word>null</Word>
48+
</Keywords>
49+
<Span color="String" ruleSet="String">
50+
<Begin>"</Begin>
51+
<End>"</End>
52+
</Span>
53+
<Span color="String" ruleSet="String">
54+
<Begin>'</Begin>
55+
<End>'</End>
56+
</Span>
57+
<Span color="Punctuation1" ruleSet="Object" multiline="true">
58+
<Begin>\{</Begin>
59+
<End>\}</End>
60+
</Span>
61+
<Span color="Punctuation2" ruleSet="Array" multiline="true">
62+
<Begin>\[</Begin>
63+
<End>\]</End>
64+
</Span>
65+
<Rule color="Number">
66+
\b0[xX][0-9a-fA-F]+|(\b\d+(\.[0-9]+)?|\.[0-9]+)([eE][+-]?[0-9]+)?
67+
</Rule>
68+
</RuleSet>
69+
70+
<RuleSet>
71+
<Import ruleSet="Expression"/>
72+
</RuleSet>
73+
</SyntaxDefinition>

QuickLook.Plugin/QuickLook.Plugin.TextViewer/Syntax/Light/Assembly.xshd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ hello@exr.be
1010
https://github.com/ei
1111
-->
1212

13-
<SyntaxDefinition name="Assembly" extensions=".asm;.ASM">
13+
<SyntaxDefinition name="Assembly" extensions=".asm">
1414

1515
<Environment>
1616
<Default color="Black" bgcolor="#FFFFFF"/>

QuickLook.Plugin/QuickLook.Plugin.TextViewer/Syntax/_LICENSE

Lines changed: 0 additions & 21 deletions
This file was deleted.

QuickLook.Plugin/QuickLook.Plugin.TextViewer/Syntax/_README.md

Lines changed: 0 additions & 198 deletions
This file was deleted.

0 commit comments

Comments
 (0)