pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #2347 from tom-englert/DarkTheme#665 

Dark theme #665 fixes
pull/2357/head
Siegfried Pammer 5 years ago committed by GitHub
parent
1f35911dfe 4acfa73695
commit
2fee6f6ea4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 57 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ILSpy/ILSpy.csproj
  2. 2
      ILSpy/Metadata/Helpers.cs
  3. 41
      ILSpy/Options/DisplaySettingsPanel.xaml
  4. 16
      ILSpy/Options/OptionsDialog.xaml
  5. 21
      ILSpy/Options/OptionsDialog.xaml.cs
  6. 2
      ILSpy/themes/DarkTheme.xaml
  7. 2
      ILSpy/themes/LightTheme.xaml
  8. 2
      SharpTreeView/ICSharpCode.TreeView.csproj

2
ILSpy/ILSpy.csproj
Unescape View File

@ -48,7 +48,7 @@
<PackageReference Include="OSVersionHelper" Version="1.1.24" /> <PackageReference Include="OSVersionHelper" Version="1.1.24" />
<PackageReference Include="DataGridExtensions" Version="2.5.0" /> <PackageReference Include="DataGridExtensions" Version="2.5.0" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" /> <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
<PackageReference Include="TomsToolbox.Wpf.Styles" Version="2.4.2" /> <PackageReference Include="TomsToolbox.Wpf.Styles" Version="2.4.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
ILSpy/Metadata/Helpers.cs
Unescape View File

@ -54,7 +54,7 @@ namespace ICSharpCode.ILSpy.Metadata
CanUserAddRows = false, CanUserAddRows = false,
CanUserDeleteRows = false, CanUserDeleteRows = false,
CanUserReorderColumns = false, CanUserReorderColumns = false,
RowHeaderWidth = 0, HeadersVisibility = DataGridHeadersVisibility.Column,
EnableColumnVirtualization = true, EnableColumnVirtualization = true,
EnableRowVirtualization = true, EnableRowVirtualization = true,
RowHeight = 20, RowHeight = 20,

41
ILSpy/Options/DisplaySettingsPanel.xaml
Unescape View File

@ -2,7 +2,8 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:properties="clr-namespace:ICSharpCode.ILSpy.Properties" xmlns:properties="clr-namespace:ICSharpCode.ILSpy.Properties"
xmlns:local="clr-namespace:ICSharpCode.ILSpy.Options"> xmlns:local="clr-namespace:ICSharpCode.ILSpy.Options"
xmlns:system="clr-namespace:System;assembly=mscorlib">
<UserControl.Resources> <UserControl.Resources>
<local:FontSizeConverter x:Key="fontSizeConv" /> <local:FontSizeConverter x:Key="fontSizeConv" />
</UserControl.Resources> </UserControl.Resources>
@ -35,25 +36,25 @@
</ComboBox> </ComboBox>
<Label Grid.Column="2" Margin="3,0" Content="{x:Static properties:Resources.Size}"></Label> <Label Grid.Column="2" Margin="3,0" Content="{x:Static properties:Resources.Size}"></Label>
<ComboBox Grid.Column="3" Text="{Binding SelectedFontSize, Converter={StaticResource fontSizeConv}}" IsEditable="True" Margin="3,0"> <ComboBox Grid.Column="3" Text="{Binding SelectedFontSize, Converter={StaticResource fontSizeConv}}" IsEditable="True" Margin="3,0">
<ComboBoxItem>6</ComboBoxItem> <system:Int32>6</system:Int32>
<ComboBoxItem>7</ComboBoxItem> <system:Int32>7</system:Int32>
<ComboBoxItem>8</ComboBoxItem> <system:Int32>8</system:Int32>
<ComboBoxItem>9</ComboBoxItem> <system:Int32>9</system:Int32>
<ComboBoxItem>10</ComboBoxItem> <system:Int32>10</system:Int32>
<ComboBoxItem>11</ComboBoxItem> <system:Int32>11</system:Int32>
<ComboBoxItem>12</ComboBoxItem> <system:Int32>12</system:Int32>
<ComboBoxItem>13</ComboBoxItem> <system:Int32>13</system:Int32>
<ComboBoxItem>14</ComboBoxItem> <system:Int32>14</system:Int32>
<ComboBoxItem>15</ComboBoxItem> <system:Int32>15</system:Int32>
<ComboBoxItem>16</ComboBoxItem> <system:Int32>16</system:Int32>
<ComboBoxItem>17</ComboBoxItem> <system:Int32>17</system:Int32>
<ComboBoxItem>18</ComboBoxItem> <system:Int32>18</system:Int32>
<ComboBoxItem>19</ComboBoxItem> <system:Int32>19</system:Int32>
<ComboBoxItem>20</ComboBoxItem> <system:Int32>20</system:Int32>
<ComboBoxItem>21</ComboBoxItem> <system:Int32>21</system:Int32>
<ComboBoxItem>22</ComboBoxItem> <system:Int32>22</system:Int32>
<ComboBoxItem>23</ComboBoxItem> <system:Int32>23</system:Int32>
<ComboBoxItem>24</ComboBoxItem> <system:Int32>24</system:Int32>
</ComboBox> </ComboBox>
<Border Grid.Row="1" Grid.ColumnSpan="4" BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" BorderThickness="1" Margin="3,5"> <Border Grid.Row="1" Grid.ColumnSpan="4" BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" BorderThickness="1" Margin="3,5">
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="AaBbCcXxYyZz" FontFamily="{Binding SelectedFont}" FontSize="{Binding SelectedFontSize}" /> <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="AaBbCcXxYyZz" FontFamily="{Binding SelectedFont}" FontSize="{Binding SelectedFontSize}" />

16
ILSpy/Options/OptionsDialog.xaml
Unescape View File

@ -2,7 +2,8 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:properties="clr-namespace:ICSharpCode.ILSpy.Properties" xmlns:properties="clr-namespace:ICSharpCode.ILSpy.Properties"
Style="{DynamicResource DialogWindow}" xmlns:options="clr-namespace:ICSharpCode.ILSpy.Options"
Style="{DynamicResource DialogWindow}"
WindowStartupLocation="CenterOwner" WindowStartupLocation="CenterOwner"
ResizeMode="CanResizeWithGrip" ResizeMode="CanResizeWithGrip"
Title="{x:Static properties:Resources.Options}" Height="500" Width="600"> Title="{x:Static properties:Resources.Options}" Height="500" Width="600">
@ -13,7 +14,18 @@
<RowDefinition <RowDefinition
Height="Auto" /> Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TabControl Name="tabControl" /> <TabControl Name="tabControl" SelectedValuePath="Content">
<TabControl.ItemTemplate>
<DataTemplate DataType="options:TabItemViewModel">
<TextBlock Text="{Binding Header}" />
</DataTemplate>
</TabControl.ItemTemplate>
<TabControl.ContentTemplate>
<DataTemplate DataType="options:TabItemViewModel">
<ContentPresenter Content="{Binding Content}" />
</DataTemplate>
</TabControl.ContentTemplate>
</TabControl>
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="12,8"> <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="12,8">
<Button Margin="2,0" Name="defaultsButton" Click="DefaultsButton_Click" Content="{x:Static properties:Resources.ResetToDefaults}" /> <Button Margin="2,0" Name="defaultsButton" Click="DefaultsButton_Click" Content="{x:Static properties:Resources.ResetToDefaults}" />
<Button IsDefault="True" Margin="2,0" Name="okButton" Click="OKButton_Click" Content="{x:Static properties:Resources.OK}" /> <Button IsDefault="True" Margin="2,0" Name="okButton" Click="OKButton_Click" Content="{x:Static properties:Resources.OK}" />

21
ILSpy/Options/OptionsDialog.xaml.cs
Unescape View File

@ -21,12 +21,26 @@ using System.ComponentModel.Composition;
using System.Linq; using System.Linq;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Documents;
using System.Windows.Media;
using System.Xml.Linq; using System.Xml.Linq;
using ICSharpCode.ILSpy.Properties; using ICSharpCode.ILSpy.Properties;
namespace ICSharpCode.ILSpy.Options namespace ICSharpCode.ILSpy.Options
{ {
public class TabItemViewModel
{
public TabItemViewModel(string header, UIElement content)
{
Header = header;
Content = content;
}
public string Header { get; }
public UIElement Content { get; }
}
/// <summary> /// <summary>
/// Interaction logic for OptionsDialog.xaml /// Interaction logic for OptionsDialog.xaml
/// </summary> /// </summary>
@ -46,9 +60,8 @@ namespace ICSharpCode.ILSpy.Options
ILSpySettings settings = ILSpySettings.Load(); ILSpySettings settings = ILSpySettings.Load();
foreach (var optionPage in optionPages.OrderBy(p => p.Metadata.Order)) foreach (var optionPage in optionPages.OrderBy(p => p.Metadata.Order))
{ {
TabItem tabItem = new TabItem(); var tabItem = new TabItemViewModel(MainWindow.GetResourceString(optionPage.Metadata.Title), optionPage.Value);
tabItem.Header = MainWindow.GetResourceString(optionPage.Metadata.Title);
tabItem.Content = optionPage.Value;
tabControl.Items.Add(tabItem); tabControl.Items.Add(tabItem);
IOptionPage page = optionPage.Value as IOptionPage; IOptionPage page = optionPage.Value as IOptionPage;
@ -76,7 +89,7 @@ namespace ICSharpCode.ILSpy.Options
{ {
if (MessageBox.Show(Properties.Resources.ResetToDefaultsConfirmationMessage, "ILSpy", MessageBoxButton.YesNo) == MessageBoxResult.Yes) if (MessageBox.Show(Properties.Resources.ResetToDefaultsConfirmationMessage, "ILSpy", MessageBoxButton.YesNo) == MessageBoxResult.Yes)
{ {
var page = ((TabItem)tabControl.SelectedItem).Content as IOptionPage; var page = tabControl.SelectedValue as IOptionPage;
if (page != null) if (page != null)
page.LoadDefaults(); page.LoadDefaults();
} }

2
ILSpy/themes/DarkTheme.xaml
Unescape View File

@ -52,7 +52,7 @@
<SolidColorBrush x:Key="{x:Static SystemColors.InactiveBorderBrushKey}" Color="#434346" /> <SolidColorBrush x:Key="{x:Static SystemColors.InactiveBorderBrushKey}" Color="#434346" />
<SolidColorBrush x:Key="{x:Static SystemColors.InactiveCaptionTextBrushKey}" Color="#F1F1F1" /> <SolidColorBrush x:Key="{x:Static SystemColors.InactiveCaptionTextBrushKey}" Color="#F1F1F1" />
<SolidColorBrush x:Key="{x:Static styles:ResourceKeys.BorderBrush}" Color="#9E9E9E" /> <SolidColorBrush x:Key="{x:Static styles:ResourceKeys.BorderBrush}" Color="#464646" />
<SolidColorBrush x:Key="{x:Static styles:ResourceKeys.DisabledBrush}" Color="#2D2D30" /> <SolidColorBrush x:Key="{x:Static styles:ResourceKeys.DisabledBrush}" Color="#2D2D30" />
<Color x:Key="{x:Static themes:ResourceKeys.TextMarkerBackgroundColor}">MediumVioletRed</Color> <Color x:Key="{x:Static themes:ResourceKeys.TextMarkerBackgroundColor}">MediumVioletRed</Color>
<SolidColorBrush x:Key="{x:Static themes:ResourceKeys.LinkTextForegroundBrush}">CornflowerBlue</SolidColorBrush> <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.LinkTextForegroundBrush}">CornflowerBlue</SolidColorBrush>

2
ILSpy/themes/LightTheme.xaml
Unescape View File

@ -47,6 +47,6 @@
<SolidColorBrush x:Key="{x:Static SystemColors.InactiveBorderBrushKey}" Color="#CCCEDB" /> <SolidColorBrush x:Key="{x:Static SystemColors.InactiveBorderBrushKey}" Color="#CCCEDB" />
<SolidColorBrush x:Key="{x:Static SystemColors.InactiveCaptionTextBrushKey}" Color="#1E1E1E" /> <SolidColorBrush x:Key="{x:Static SystemColors.InactiveCaptionTextBrushKey}" Color="#1E1E1E" />
<SolidColorBrush x:Key="{x:Static styles:ResourceKeys.BorderBrush}" Color="#686868" /> <SolidColorBrush x:Key="{x:Static styles:ResourceKeys.BorderBrush}" Color="#CCCEDB" />
<SolidColorBrush x:Key="{x:Static styles:ResourceKeys.DisabledBrush}" Color="#EEEEF2" /> <SolidColorBrush x:Key="{x:Static styles:ResourceKeys.DisabledBrush}" Color="#EEEEF2" />
</ResourceDictionary> </ResourceDictionary>

2
SharpTreeView/ICSharpCode.TreeView.csproj
Unescape View File

@ -20,7 +20,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TomsToolbox.Wpf.Styles" Version="2.4.2" /> <PackageReference Include="TomsToolbox.Wpf.Styles" Version="2.4.3" />
</ItemGroup> </ItemGroup>
</Project> </Project>

Write Preview
Loading…
Cancel
Save