ICSharpCode
/
AvaloniaILSpy
зеркало из https://github.com/icsharpcode/AvaloniaILSpy.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'master' into features/themes

This commit is contained in:
Jeffrey Ye 2018-12-18 15:13:56 -08:00
Родитель a9a5aefa5a dcf2365775
Коммит eb9e1e568b
28 изменённых файлов: 146 добавлений и 192 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
ILSpy.Core/App.xaml
Просмотреть файл

@ -5,9 +5,9 @@
<StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
<StyleInclude Source="resm:AvaloniaEdit.AvaloniaEdit.xaml?assembly=AvaloniaEdit" />
<StyleInclude Source="resm:ICSharpCode.TreeView.Themes.TreeView.xaml?assembly=SharpTreeView" />
<StyleInclude Source="resm:ICSharpCode.ILSpy.Controls.DockedPane.xaml" />
<StyleInclude Source="resm:ICSharpCode.ILSpy.Controls.SearchBox.xaml" />
<StyleInclude Source="avares://SharpTreeView/Themes/TreeView.xaml" />
<StyleInclude Source="/Controls/DockedPane.xaml" />
<StyleInclude Source="/Controls/SearchBox.xaml" />
<Style Selector="Window.DialogWindow" >
<Setter Property="ShowInTaskbar" Value="False"/>

4
ILSpy.Core/Commands/ILSpyCommands.cs
Просмотреть файл

@ -34,8 +34,8 @@ namespace ICSharpCode.ILSpy
public static class NavigationCommands
{
public static RoutedCommand BrowseBack { get; } = new RoutedCommand(nameof(BrowseBack), new KeyGesture { Modifiers = InputModifiers.Control, Key = Key.BrowserBack });
public static RoutedCommand BrowseForward { get; } = new RoutedCommand(nameof(BrowseForward), new KeyGesture { Modifiers = InputModifiers.Control, Key = Key.BrowserForward });
public static RoutedCommand BrowseBack { get; } = new NavigationCommand(nameof(BrowseBack), new KeyGesture { Modifiers = InputModifiers.Control, Key = Key.BrowserBack });
public static RoutedCommand BrowseForward { get; } = new NavigationCommand(nameof(BrowseForward), new KeyGesture { Modifiers = InputModifiers.Control, Key = Key.BrowserForward });
public static RoutedCommand Search { get; } = new RoutedCommand(nameof(Search), new KeyGesture { Modifiers = InputModifiers.Control | InputModifiers.Shift, Key = Key.F });
}

36
ILSpy.Core/Commands/NavigationCommand.cs Normal file
Просмотреть файл

@ -0,0 +1,36 @@
using System;
using System.Windows.Input;
using Avalonia.Input;
using Avalonia.Interactivity;
using AvaloniaEdit;
namespace ICSharpCode.ILSpy
{
/// <summary>
/// Navigation command. CanExecuteChanged will get called when focused is changed.
/// </summary>
internal class NavigationCommand: RoutedCommand, ICommand
{
static EventHandler interactiveEventHandler;
static NavigationCommand()
{
InputElement.GotFocusEvent.AddClassHandler(typeof(InputElement), HandlePointerEvent);
}
public NavigationCommand(string name, KeyGesture keyGesture) : base(name, keyGesture)
{
}
private static void HandlePointerEvent(object sender, RoutedEventArgs args)
{
interactiveEventHandler?.Invoke(sender, args);
}
event EventHandler ICommand.CanExecuteChanged
{
add { interactiveEventHandler += value; }
remove { interactiveEventHandler -= value; }
}
}
}

5
ILSpy.Core/Controls/CustomDialog.xaml
Просмотреть файл

@ -2,14 +2,15 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ae="clr-namespace:AvaloniaEdit;assembly=AvaloniaEdit"
Title="Message"
Width="274" Height="400">
Width="274" Height="400"
x:Class="ICSharpCode.ILSpy.Controls.CustomDialog">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="40"/>
</Grid.RowDefinitions>
<ae:TextEditor Name="content" Grid.Row="0" Margin="4"/>
<TextBlock Name="content" Grid.Row="0" Margin="4" TextWrapping="Wrap"/>
<ListBox Name="buttons" Grid.Row="1" BorderThickness="0" Padding="2">
<ListBox.ItemsPanel>
<ItemsPanelTemplate>

4
ILSpy.Core/Controls/CustomDialog.xaml.cs
Просмотреть файл

@ -30,7 +30,7 @@ namespace ICSharpCode.ILSpy.Controls
{
public sealed class CustomDialog : DialogWindow
{
TextEditor label;
TextBlock label;
ListBox buttons;
int acceptButton;
int cancelButton;
@ -78,7 +78,7 @@ namespace ICSharpCode.ILSpy.Controls
{
AvaloniaXamlLoader.Load(this);
this.buttons = this.FindControl<ListBox>("buttons");
this.label = this.FindControl<TextEditor>("content");
this.label = this.FindControl<TextBlock>("content");
this.ShowInTaskbar = false;
this.WindowStartupLocation = WindowStartupLocation.CenterOwner;

94
ILSpy.Core/Controls/DockedPane.xaml
Просмотреть файл

@ -29,51 +29,9 @@
</StackPanel>
</DataTemplate>
-->
<Styles.Resources>
<SolidColorBrush x:Key="paneBorder">#828790</SolidColorBrush>
</Styles.Resources>
<Style Selector="Button.CloseButtonStyle">
<Setter Property="Background">
<Setter.Value>
<LinearGradientBrush EndPoint="0%,100%" StartPoint="0%,0%">
<GradientStop Offset="0">
<GradientStop.Color>
<controls:ControlColor Color="243" />
</GradientStop.Color>
</GradientStop>
<GradientStop Offset="0.5">
<GradientStop.Color>
<controls:ControlColor Color="235" />
</GradientStop.Color>
</GradientStop>
<GradientStop Offset="0.5">
<GradientStop.Color>
<controls:ControlColor Color="221" />
</GradientStop.Color>
</GradientStop>
<GradientStop Offset="1">
<GradientStop.Color>
<controls:ControlColor Color="205" />
</GradientStop.Color>
</GradientStop>
</LinearGradientBrush>
</Setter.Value>
</Setter>
<Setter Property="BorderBrush">
<Setter.Value>
<SolidColorBrush>
<SolidColorBrush.Color>
<controls:ControlColor Color="150" />
</SolidColorBrush.Color>
</SolidColorBrush>
</Setter.Value>
</Setter>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="Foreground" Value="{x:Static avalonia:SystemColors.ControlTextBrush}"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="4"/>
@ -81,7 +39,7 @@
<Setter.Value>
<ControlTemplate>
<Grid>
<Border x:Name="buttonBorder" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2" />
<Border x:Name="buttonBorder" Background="{DynamicResource ThemeBackgroundBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2" />
<ContentPresenter Name="PART_ContentPresenter" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
</Grid>
</ControlTemplate>
@ -89,42 +47,12 @@
</Setter>
</Style>
<Style Selector="Button.CloseButtonStyle:pointerover /template/ Grid.Border#buttonBorder">
<Setter Property="Background">
<Setter.Value>
<LinearGradientBrush EndPoint="0%,100%" StartPoint="0%,0%">
<GradientStop Offset="0">
<GradientStop.Color>
<controls:ControlColor Color="250" Highlight="0.3"/>
</GradientStop.Color>
</GradientStop>
<GradientStop Offset="1">
<GradientStop.Color>
<controls:ControlColor Color="224" Highlight="0.4"/>
</GradientStop.Color>
</GradientStop>
</LinearGradientBrush>
</Setter.Value>
</Setter>
<Style Selector="Button.CloseButtonStyle:pointerover">
<Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighlightMidBrush}" />
</Style>
<Style Selector="Button.CloseButtonStyle:pressed /template/ Grid.Border#buttonBorder">
<Setter Property="Background">
<Setter.Value>
<LinearGradientBrush EndPoint="0%,100%" StartPoint="0%,0%">
<GradientStop Offset="0">
<GradientStop.Color>
<controls:ControlColor Color="224"/>
</GradientStop.Color>
</GradientStop>
<GradientStop Offset="1">
<GradientStop.Color>
<controls:ControlColor Color="224" Highlight="0.4"/>
</GradientStop.Color>
</GradientStop>
</LinearGradientBrush>
</Setter.Value>
</Setter>
<Style Selector="Button.CloseButtonStyle:pressed">
<Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighlightHighBrush}" />
</Style>
<!-- DockedPane -->
@ -132,19 +60,18 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate>
<Border BorderThickness="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness}" BorderBrush="{StaticResource paneBorder}">
<Border BorderThickness="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness}" BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderBrush}">
<DockPanel>
<Border BorderThickness="0,0,0,0" BorderBrush="{StaticResource paneBorder}"
Background="{x:Static avalonia:SystemColors.InactiveCaptionBrush}" DockPanel.Dock="Top">
<Border BorderThickness="0,0,0,0"
Background="{DynamicResource ThemeAccentBrush}" DockPanel.Dock="Top">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock Text="{TemplateBinding Title}" Margin="3,0"
Foreground="{x:Static avalonia:SystemColors.InactiveCaptionTextBrush}" VerticalAlignment="Center"/>
<TextBlock Text="{TemplateBinding Title}" Margin="3,0" VerticalAlignment="Center"/>
<Button x:Name="PART_Close" Grid.Column="2" VerticalAlignment="Center" MinWidth="20" MinHeight="20" Width="20" Height="20" DockPanel.Dock="Right" Classes="CloseButtonStyle" ToolTip.Tip="Close" Margin="1">
<Path x:Name="Path" Width="16" Height="16" Stretch="Fill" StrokeThickness="0.5" Stroke="#FF333333" Fill="#FF969696" Data="F1 M 0,1.3333L 1.33333,0L 4,2.6666L 6.6666,0 8,1.3333L 5.3333,4L 8,6.6666L 6.6666,8L 4,5.3333L 1.3333,8L 0,6.6666L 2.6666,4L 0,1.3333 Z " HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
<Path x:Name="Path" Width="16" Height="16" Stretch="Fill" StrokeThickness="0.5" Stroke="{DynamicResource ThemeForegroundBrush}" Fill="{DynamicResource ThemeForegroundBrush}" Data="F1 M 0,1.3333L 1.33333,0L 4,2.6666L 6.6666,0 8,1.3333L 5.3333,4L 8,6.6666L 6.6666,8L 4,5.3333L 1.3333,8L 0,6.6666L 2.6666,4L 0,1.3333 Z " HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
</Button>
</Grid>
</Border>
@ -162,6 +89,5 @@
</ControlTemplate>
</Setter.Value>
</Setter>
<Setter Property="BorderBrush" Value="{StaticResource paneBorder}" />
</Style>
</Styles>

3
ILSpy.Core/Controls/ResourceObjectTable.xaml
Просмотреть файл

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="ICSharpCode.ILSpy.Controls.ResourceObjectTable">
<Grid Margin="5,0,0,0">
<!--
<Grid.Resources>

1
ILSpy.Core/Controls/ResourceStringTable.xaml
Просмотреть файл

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="ICSharpCode.ILSpy.Controls.ResourceStringTable"
>
<Grid Margin="5,0,0,0">
<!--

29
ILSpy.Core/Controls/SearchBox.cs
Просмотреть файл

@ -28,6 +28,7 @@ using Avalonia.Media.Imaging;
using System.ComponentModel;
using Avalonia.Markup.Xaml.Converters;
using Avalonia.Controls.Primitives;
using Avalonia.Data.Converters;
namespace ICSharpCode.ILSpy.Controls
{
@ -39,16 +40,18 @@ namespace ICSharpCode.ILSpy.Controls
public static StyledProperty<IBitmap> ClearSearchIconProperty = AvaloniaProperty.Register<SearchBox, IBitmap>(nameof(ClearSearchIcon));
public static StyledProperty<IBrush> WatermarkColorProperty = AvaloniaProperty.Register<SearchBox, IBrush>(nameof(WatermarkColor));
public static readonly StyledProperty<TimeSpan> UpdateDelayProperty =
public static StyledProperty<IBrush> WatermarkColorProperty = AvaloniaProperty.Register<SearchBox, IBrush>(nameof(WatermarkColor));
public static readonly IValueConverter GridLengthConvert = new FuncValueConverter<double, GridLength>(n => new GridLength(n));
public static readonly StyledProperty<TimeSpan> UpdateDelayProperty =
AvaloniaProperty.Register<SearchBox, TimeSpan>(nameof(UpdateDelay), TimeSpan.FromMilliseconds(200));
#endregion
public SearchBox()
{
PseudoClass(TextProperty, t=>!string.IsNullOrEmpty(t), ":hastext");
PseudoClass<SearchBox, string>(TextProperty, t=>!string.IsNullOrEmpty(t), ":hastext");
}
#region Public Properties
@ -75,18 +78,18 @@ namespace ICSharpCode.ILSpy.Controls
get { return GetValue(ClearSearchIconProperty); }
set { SetValue(ClearSearchIconProperty, value); }
}
#endregion
#region Handlers
#endregion
#region Handlers
private void IconBorder_MouseLeftButtonUp(object obj, PointerReleasedEventArgs e) {
this.Text = string.Empty;
}
#endregion
#region Overrides
#endregion
#region Overrides
protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
{
@ -107,6 +110,6 @@ namespace ICSharpCode.ILSpy.Controls
base.OnKeyDown(e);
}
}
#endregion
}
#endregion
}
}

60
ILSpy.Core/Controls/SearchBox.xaml
Просмотреть файл

@ -5,10 +5,10 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib">
<Style Selector="local|SearchBox">
<Setter Property="Background" Value="White" />
<Setter Property="BorderBrush" Value="{x:Static avalonia:SystemColors.ControlDarkBrush}" />
<Setter Property="Foreground" Value="{x:Static avalonia:SystemColors.ControlTextBrush}" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
<Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate>
@ -19,29 +19,29 @@
<Grid x:Name="LayoutGrid">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ActualHeight}" />
<ColumnDefinition Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Bounds.Height, Converter={x:Static local:SearchBox.GridLengthConvert}}}" />
</Grid.ColumnDefinitions>
<ScrollViewer Grid.Column="0" HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
<ScrollViewer Grid.Column="0" HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
<Panel>
<TextBlock Name="WatermarkLabel"
Opacity="0.5"
Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=WatermarkColor}"
Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Watermark}"
IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.NullOrEmpty}}"
FontStyle="Italic" />
<TextPresenter Name="PART_TextPresenter"
Text="{TemplateBinding Text, Mode=TwoWay}"
CaretIndex="{TemplateBinding CaretIndex}"
SelectionStart="{TemplateBinding SelectionStart}"
SelectionEnd="{TemplateBinding SelectionEnd}"
TextAlignment="{TemplateBinding TextAlignment}"
TextWrapping="{TemplateBinding TextWrapping}"
PasswordChar="{TemplateBinding PasswordChar}"/>
</Panel>
</ScrollViewer>
<Panel>
<TextBlock Name="WatermarkLabel"
Opacity="0.5"
Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=WatermarkColor}"
Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Watermark}"
IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.NullOrEmpty}}"
FontStyle="Italic" />
<TextPresenter Name="PART_TextPresenter"
Text="{TemplateBinding Text, Mode=TwoWay}"
CaretIndex="{TemplateBinding CaretIndex}"
SelectionStart="{TemplateBinding SelectionStart}"
SelectionEnd="{TemplateBinding SelectionEnd}"
TextAlignment="{TemplateBinding TextAlignment}"
TextWrapping="{TemplateBinding TextWrapping}"
PasswordChar="{TemplateBinding PasswordChar}"/>
</Panel>
</ScrollViewer>
<Border Name="PART_IconBorder"
Grid.Column="1"
@ -50,12 +50,12 @@
HorizontalAlignment="Stretch"
BorderBrush="Transparent"
Background="Transparent">
<Image Name="SearchIcon"
Cursor="Arrow"
Stretch="None"
HorizontalAlignment="Center"
VerticalAlignment="Center" >
</Image>
<Image Name="SearchIcon"
Cursor="Arrow"
Stretch="None"
HorizontalAlignment="Center"
VerticalAlignment="Center" >
</Image>
</Border>
</Grid>
</Border>

3
ILSpy.Core/CreateListDialog.xaml
Просмотреть файл

@ -4,7 +4,8 @@
Classes="DialogWindow"
WindowStartupLocation="CenterOwner"
Width="300"
Height="150">
Height="150"
x:Class="ICSharpCode.ILSpy.CreateListDialog">
<Grid Margin="12,8">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />

1
ILSpy.Core/DebugSteps.xaml
Просмотреть файл

@ -3,6 +3,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:ICSharpCode.ILSpy"
x:Class="ICSharpCode.ILSpy.DebugSteps"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
<DockPanel>

15
ILSpy.Core/ILSpy.Core.csproj
Просмотреть файл

@ -33,6 +33,7 @@
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
<PackageReference Include="NuGet.Client" Version="4.2.0" />
<PackageReference Include="Microsoft.DiaSymReader" Version="1.3.0" />
<PackageReference Include="Avalonia" Version="0.7.1-build989-beta" />
</ItemGroup>
<ItemGroup>
@ -42,28 +43,24 @@
<ItemGroup>
<Compile Update="**\*.xaml.cs">
</Compile>
<EmbeddedResource Include="**\*.xaml">
<AvaloniaResource Include="**\*.xaml">
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="**\*.xshd;**\*.resx;Assets\*;**\*.paml" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
</AvaloniaResource>
</ItemGroup>
<ItemGroup>
<Content Include="Images\*.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<EmbeddedResource Include="Images\ILSpy.png;Images\PrivateInternal.png;Images\Search.png;;Images\ClearSearch.png;">
</EmbeddedResource>
<AvaloniaResource Include="Images\ILSpy.png;Images\PrivateInternal.png;Images\Search.png;Images\ClearSearch.png;">
</AvaloniaResource>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="README.txt" />
<EmbeddedResource Include="..\doc\*.txt" />
<EmbeddedResource Include="**\*.xshd;**\*.resx;Assets\*;**\*.paml" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
</ItemGroup>
<ItemGroup>

4
ILSpy.Core/MainWindow.xaml
Просмотреть файл

@ -7,7 +7,7 @@
MinWidth="250"
MinHeight="200"
UseLayoutRounding="True"
Icon="resm:ICSharpCode.ILSpy.Images.ILSpy.png?assembly=ILSpy.Core"
Icon="/Images/ILSpy.png"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" d:DesignHeight="500" d:DesignWidth="500"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"
x:Class="ICSharpCode.ILSpy.MainWindow"
@ -49,7 +49,7 @@
<Separator />
<CheckBox IsChecked="{Binding FilterSettings.ShowInternalApi}"
ToolTip.Tip="Show internal types and members">
<Image Width="16" Height="16" Source="resm:ICSharpCode.ILSpy.Images.PrivateInternal.png?assembly=ILSpy.Core" />
<Image Width="16" Height="16" Source="/Images/PrivateInternal.png" />
</CheckBox>
<Separator />
<DropDown Name="languageComboBox" Width="100"

1
ILSpy.Core/OpenListDialog.xaml
Просмотреть файл

@ -8,6 +8,7 @@
MinHeight="250"
Height="350"
Width="480"
x:Class="ICSharpCode.ILSpy.OpenListDialog"
>
<Grid Margin="12,8">
<Grid.RowDefinitions>

1
ILSpy.Core/OpenListDialog.xaml.cs
Просмотреть файл

@ -22,7 +22,6 @@ using Mono.Cecil;
using Avalonia.Input;
using System;
using Avalonia.Interactivity;
using Avalonia.Input;
using ICSharpCode.TreeView;
using Avalonia.Markup.Xaml;
using ICSharpCode.ILSpy.Controls;

3
ILSpy.Core/Options/DecompilerSettingsPanel.xaml
Просмотреть файл

@ -1,6 +1,7 @@
<UserControl
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="ICSharpCode.ILSpy.Options.DecompilerSettingsPanel">
<StackPanel Margin="10">
<CheckBox IsChecked="{Binding UseDebugSymbols}">Use variable names from debug symbols, if available</CheckBox>
<CheckBox IsChecked="{Binding ShowDebugInfo}">Show info from debug symbols, if available</CheckBox>

5
ILSpy.Core/Options/DisplaySettingsPanel.xaml
Просмотреть файл

@ -1,6 +1,7 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:ICSharpCode.ILSpy.Options">
xmlns:local="clr-namespace:ICSharpCode.ILSpy.Options"
x:Class="ICSharpCode.ILSpy.Options.DisplaySettingsPanel">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
@ -48,7 +49,7 @@
<DropDownItem>23</DropDownItem>
<DropDownItem>24</DropDownItem>
</DropDown>
<Border Grid.Row="1" Grid.ColumnSpan="4" BorderBrush="Black" BorderThickness="1" Background="White" Margin="3,5">
<Border Grid.Row="1" Grid.ColumnSpan="4" BorderBrush="{DynamicResource ThemeControlHighlightHighBrush}" BorderThickness="1" Margin="3,5">
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="AaBbCcXxYyZz" FontFamily="{Binding SelectedFont}" FontSize="{Binding SelectedFontSize}" />
</Border>
</Grid>

1
ILSpy.Core/Options/MiscSettingsPanel.xaml
Просмотреть файл

@ -2,6 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
x:Class="ICSharpCode.ILSpy.Options.MiscSettingsPanel"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
<StackPanel Margin="10">

3
ILSpy.Core/Options/OptionsDialog.xaml
Просмотреть файл

@ -3,7 +3,8 @@
Classes="DialogWindow"
CanResize="True"
WindowStartupLocation="CenterOwner"
Title="Options" Height="400" Width="500">
Title="Options" Height="400" Width="500"
x:Class="ICSharpCode.ILSpy.Options.OptionsDialog">
<Grid>
<Grid.RowDefinitions>
<RowDefinition

10
ILSpy.Core/Search/SearchPane.xaml
Просмотреть файл

@ -1,4 +1,4 @@
<UserControl x:Class="AvaloniaILSpy.SearchPane" xmlns="https://github.com/avaloniaui"
<UserControl x:Class="ICSharpCode.ILSpy.Search.SearchPane" xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:ICSharpCode.ILSpy.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@ -10,19 +10,19 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Border BorderThickness="0,0,0,1" BorderBrush="{x:Static avalonia:SystemColors.ControlLightBrush}" Background="{x:Static avalonia:SystemColors.ControlBrush}">
<Border BorderThickness="0,0,0,1" BorderBrush="{DynamicResource ThemeBorderLowBrush}" Background="{DynamicResource ThemeBackgroundBrush}}">
<Grid Height="23">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<local:SearchBox x:Name="searchBox" DockPanel.Dock="Top" Grid.Column="0" Grid.Row="0" Margin="1"
SearchIcon="resm:ICSharpCode.ILSpy.Images.Search.png?assembly=ILSpy.Core" ClearSearchIcon="resm:ICSharpCode.ILSpy.Images.ClearSearch.png?assembly=ILSpy.Core"
SearchIcon="/Images/Search.png" ClearSearchIcon="/Images/ClearSearch.png"
Text="{Binding SearchTerm, ElementName=searchPane}" ToolTip.Tip="Search" UpdateDelay="0:0:0.1"
WatermarkColor="Gray" Watermark="Search for t:TypeName, m:Member or c:Constant; use exact match (=term), 'should not contain' (-term) or 'must contain' (+term); use /reg(ular)?Ex(pressions)?/ or both - t:/Type(Name)?/..." />
<StackPanel Grid.Column="1" Grid.Row="0" Orientation="Horizontal">
<TextBlock Margin="0,-1">_Search for:</TextBlock>
<DropDown Width="100" Name="searchModeComboBox" Margin="1">
<TextBlock VerticalAlignment="Center">Search for:</TextBlock>
<DropDown Width="150" Name="searchModeComboBox" Margin="1">
<DropDown.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">

3
ILSpy.Core/TextView/DecompilerTextView.xaml
Просмотреть файл

@ -2,7 +2,8 @@
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:avalonia="clr-namespace:Avalonia;assembly=SharpTreeView"
xmlns:ae="clr-namespace:AvaloniaEdit;assembly=AvaloniaEdit">
xmlns:ae="clr-namespace:AvaloniaEdit;assembly=AvaloniaEdit"
x:Class="ICSharpCode.ILSpy.TextView.DecompilerTextView">
<Grid>
<Border BorderThickness="1,1,0,1" BorderBrush="#FF828790">
<Grid>

3
ILSpy.Core/TextView/DecompilerTextView.xaml.cs
Просмотреть файл

@ -148,9 +148,6 @@ namespace ICSharpCode.ILSpy.TextView
progressBar = this.FindControl<ProgressBar>("progressBar");
cancelButton = this.FindControl<Button>("cancelButton");
cancelButton.Click += cancelButton_Click;
textEditor.Foreground = SystemColors.InfoTextBrush;
textEditor.Background = SystemColors.InfoBrush;
}
void RemoveEditCommand(RoutedCommand command)

16
ILSpy/Program.cs
Просмотреть файл

@ -41,21 +41,7 @@ namespace ICSharpCode.ILSpy
Logger.Sink = new ProxyLogSink(Logger.Sink);
#endif
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
result.UseAvaloniaNative(null, opts =>
{
opts.UseDeferredRendering = false;
opts.UseGpu = true;
}).UseSkia();
}
else
{
result.UsePlatformDetect();
}
return result;
return result.UsePlatformDetect();
}
class ProxyLogSink : ILogSink

13
SharpTreeView/LinesRenderer.cs
Просмотреть файл

@ -3,6 +3,7 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Layout;
using Avalonia.Media;
using System.Diagnostics;
@ -21,7 +22,6 @@ namespace ICSharpCode.TreeView
{
get { return TemplatedParent as SharpTreeNodeView; }
}
public override void Render(DrawingContext dc)
{
@ -31,20 +31,21 @@ namespace ICSharpCode.TreeView
Debug.WriteLine($"LinesRenderer.OnRender() called with DataContext={NodeView.DataContext}");
return;
}
var indent = NodeView.CalculateIndent();
var indent = NodeView.CalculateIndent();
var p = new Point(indent + 4.5, 0);
if (!NodeView.Node.IsRoot || NodeView.ParentTreeView.ShowRootExpander) {
dc.DrawLine(pen, new Point(p.X, Height / 2), new Point(p.X + 10, Height / 2));
dc.DrawLine(pen, new Point(p.X, Bounds.Height / 2), new Point(p.X + 10, Bounds.Height / 2));
}
if (NodeView.Node.IsRoot) return;
if (NodeView.Node.IsLast) {
dc.DrawLine(pen, p, new Point(p.X, Height / 2));
dc.DrawLine(pen, p, new Point(p.X, Bounds.Height / 2));
}
else {
dc.DrawLine(pen, p, new Point(p.X, Height));
dc.DrawLine(pen, p, new Point(p.X, Bounds.Height));
}
var current = NodeView.Node;
@ -53,7 +54,7 @@ namespace ICSharpCode.TreeView
current = current.Parent;
if (p.X < 0) break;
if (!current.IsLast) {
dc.DrawLine(pen, p, new Point(p.X, Height));
dc.DrawLine(pen, p, new Point(p.X, Bounds.Height));
}
}
}

9
SharpTreeView/SharpTreeView.cs
Просмотреть файл

@ -257,9 +257,6 @@ namespace ICSharpCode.TreeView
if (doNotScrollOnExpanding)
return;
// TODO: make sure node is materialized
return;
SharpTreeNode lastVisibleChild = node;
while (true) {
SharpTreeNode tmp = lastVisibleChild.Children.LastOrDefault(c => c.IsVisible);
@ -301,10 +298,10 @@ namespace ICSharpCode.TreeView
if (!container.Node.IsExpanded && container.Node.ShowExpander) {
container.Node.IsExpanded = true;
} else if (container.Node.Children.Count > 0) {
// jump to first child:
// jump to first child:
//container.MoveFocus(new TraversalRequest(FocusNavigationDirection.Down));
}
//container.MoveFocus(new TraversalRequest(FocusNavigationDirection.Down));
}
e.Handled = true;
}
break;

3
SharpTreeView/SharpTreeView.csproj
Просмотреть файл

@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="Themes\TreeView.xaml" />
<AvaloniaResource Include="Themes\TreeView.xaml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Consts.cs" />
@ -48,5 +48,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AvaloniaEdit\src\AvaloniaEdit\AvaloniaEdit.csproj" />
<PackageReference Include="Avalonia" Version="0.7.1-build989-beta" />
</ItemGroup>
</Project>

2
SharpTreeView/Themes/TreeView.xaml
Просмотреть файл

@ -189,7 +189,7 @@
<Style Selector="local|SharpTreeViewItem[IsSelected=true] /template/ local|SharpTreeNodeView#nodeView" >
<Setter
Property="TextBackground"
Value="{DynamicResource ThemeAccentBrush4}}" />
Value="{DynamicResource ThemeAccentBrush4}" />
<Setter
Property="Foreground"
Value="{x:Static avalonia:SystemColors.HighlightTextBrush}" />