Browse Source

Add resource keys for text foreground/background

pull/2906/head
Lucas Trzesniewski 2 years ago
parent
commit
f0295e7719
  1. 1
      .gitignore
  2. 7
      ILSpy/TextView/DecompilerTextView.xaml
  3. 3
      ILSpy/Themes/DarkTheme.xaml
  4. 3
      ILSpy/Themes/LightTheme.xaml
  5. 2
      ILSpy/Themes/ResourceKeys.cs

1
.gitignore vendored

@ -8,6 +8,7 @@ _ReSharper*/ @@ -8,6 +8,7 @@ _ReSharper*/
*.ReSharper
*.patch
.vs/
.idea/
/ILSpy.AddIn*/Packages/*
/ILSpy.AddIn*/source.extension.vsixmanifest
/ICSharpCode.Decompiler.Tests/TestCases/Disassembler/Pretty/*.dll

7
ILSpy/TextView/DecompilerTextView.xaml

@ -6,7 +6,8 @@ @@ -6,7 +6,8 @@
xmlns:local="clr-namespace:ICSharpCode.ILSpy.TextView"
xmlns:ae="clr-namespace:ICSharpCode.AvalonEdit;assembly=ICSharpCode.AvalonEdit"
xmlns:folding="clr-namespace:ICSharpCode.AvalonEdit.Folding;assembly=ICSharpCode.AvalonEdit"
xmlns:styles="urn:TomsToolbox.Wpf.Styles">
xmlns:styles="urn:TomsToolbox.Wpf.Styles"
xmlns:themes="clr-namespace:ICSharpCode.ILSpy.Themes">
<UserControl.Resources>
<BooleanToVisibilityConverter x:Key="boolToVisibility" />
<SolidColorBrush x:Key="waitAdornerBackgoundBrush" Color="{DynamicResource {x:Static SystemColors.WindowColorKey}}" Opacity=".75"/>
@ -15,8 +16,8 @@ @@ -15,8 +16,8 @@
<Border BorderThickness="1,1,0,1" BorderBrush="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}">
<Grid>
<ae:TextEditor Name="textEditor" AutomationProperties.Name="Decompilation" FontFamily="Consolas" FontSize="10pt" IsReadOnly="True"
Background="{DynamicResource {x:Static SystemColors.InfoBrushKey}}"
Foreground="{DynamicResource {x:Static SystemColors.InfoTextBrushKey}}"
Background="{DynamicResource {x:Static themes:ResourceKeys.TextBackgroundColor}}"
Foreground="{DynamicResource {x:Static themes:ResourceKeys.TextForegroundColor}}"
folding:FoldingMargin.FoldingMarkerBackgroundBrush="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
folding:FoldingMargin.SelectedFoldingMarkerBackgroundBrush="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
folding:FoldingMargin.FoldingMarkerBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"

3
ILSpy/Themes/DarkTheme.xaml

@ -6,6 +6,9 @@ @@ -6,6 +6,9 @@
<ResourceDictionary Source="/AvalonDock.Themes.VS2013;component/darktheme.xaml" />
</ResourceDictionary.MergedDictionaries>
<SolidColorBrush x:Key="{x:Static themes:ResourceKeys.TextBackgroundColor}" Color="#333337" />
<SolidColorBrush x:Key="{x:Static themes:ResourceKeys.TextForegroundColor}" Color="#F1F1F1" />
<Color x:Key="{x:Static SystemColors.ControlLightLightColorKey}">#333337</Color>
<Color x:Key="{x:Static SystemColors.ControlLightColorKey}">#464646</Color>
<Color x:Key="{x:Static SystemColors.ControlColorKey}">#252526</Color>

3
ILSpy/Themes/LightTheme.xaml

@ -6,6 +6,9 @@ @@ -6,6 +6,9 @@
<ResourceDictionary Source="/AvalonDock.Themes.VS2013;component/lighttheme.xaml" />
</ResourceDictionary.MergedDictionaries>
<SolidColorBrush x:Key="{x:Static themes:ResourceKeys.TextBackgroundColor}" Color="{DynamicResource {x:Static SystemColors.InfoColorKey}}" />
<SolidColorBrush x:Key="{x:Static themes:ResourceKeys.TextForegroundColor}" Color="{DynamicResource {x:Static SystemColors.InfoTextColorKey}}" />
<Color x:Key="{x:Static SystemColors.ControlLightLightColorKey}">#FCFCFC</Color>
<Color x:Key="{x:Static SystemColors.ControlLightColorKey}">#D8D8E0</Color>
<Color x:Key="{x:Static SystemColors.ControlColorKey}">#F5F5F5</Color>

2
ILSpy/Themes/ResourceKeys.cs

@ -22,6 +22,8 @@ namespace ICSharpCode.ILSpy.Themes @@ -22,6 +22,8 @@ namespace ICSharpCode.ILSpy.Themes
{
public static class ResourceKeys
{
public static ResourceKey TextBackgroundColor = new ComponentResourceKey(typeof(ResourceKeys), "TextBackgroundColor");
public static ResourceKey TextForegroundColor = new ComponentResourceKey(typeof(ResourceKeys), "TextForegroundColor");
public static ResourceKey TextMarkerBackgroundColor = new ComponentResourceKey(typeof(ResourceKeys), "TextMarkerBackgroundColor");
public static ResourceKey TextMarkerDefinitionBackgroundColor = new ComponentResourceKey(typeof(ResourceKeys), "TextMarkerDefinitionBackgroundColor");
public static ResourceKey LinkTextForegroundBrush = new ComponentResourceKey(typeof(ResourceKeys), "LinkTextForegroundBrush");

Loading…
Cancel
Save