tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Remove temporary hacks from 8ea2234. 

Add a dummy function to load the DataGrid assembly before
 initializing Avalonia.
Move DataGrid theme back to Avalonia.Controls.DataGrid.
pull/2109/head
Jumar Macato 7 years ago
parent
d5399091b6
commit
4f00869837
No known key found for this signature in database GPG Key ID: B19884DAC3A5BF3F
12 changed files with 695 additions and 694 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      build/CoreLibraries.props
  2. 2
      samples/ControlCatalog.Desktop/Program.cs
  3. 3
      samples/ControlCatalog.NetCore/Program.cs
  4. 1
      samples/ControlCatalog/App.xaml
  5. 1
      samples/ControlCatalog/ControlCatalog.csproj
  6. 1
      src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
  7. 1370
      src/Avalonia.Controls.DataGrid/DataGrid.cs
  8. 6
      src/Avalonia.Controls.DataGrid/Default.xaml
  9. 1
      src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
  10. 1
      src/Avalonia.Themes.Default/DefaultTheme.xaml
  11. 1
      src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
  12. 1
      src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaRuntimeTypeProvider.cs

1
build/CoreLibraries.props
View File

@ -3,7 +3,6 @@
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Base/Avalonia.Base.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Animation/Avalonia.Animation.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Controls/Avalonia.Controls.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Input/Avalonia.Input.csproj" />

2
samples/ControlCatalog.Desktop/Program.cs
View File

@ -13,6 +13,8 @@ namespace ControlCatalog
[STAThread]
static void Main(string[] args)
{
Avalonia.Controls.DataGrid.Load();
// TODO: Make this work with GTK/Skia/Cairo depending on command-line args
// again.
BuildAvaloniaApp().Start<MainWindow>();

3
samples/ControlCatalog.NetCore/Program.cs
View File

@ -9,9 +9,10 @@ namespace ControlCatalog.NetCore
{
static class Program
{
static void Main(string[] args)
{
Avalonia.Controls.DataGrid.Load();
Thread.CurrentThread.TrySetApartmentState(ApartmentState.STA);
if (args.Contains("--wait-for-attach"))
{

1
samples/ControlCatalog/App.xaml
View File

@ -4,6 +4,7 @@
<Application.Styles>
<StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
<StyleInclude Source="resm:Avalonia.Controls.DataGrid.Default.xaml?assembly=Avalonia.Controls.DataGrid"/>
<Style Selector="TextBlock.h1">
<Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}"/>
<Setter Property="FontWeight" Value="Medium"/>

1
samples/ControlCatalog/ControlCatalog.csproj
View File

@ -22,6 +22,7 @@
<ItemGroup>
<ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />
<ProjectReference Include="..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj" />
<ProjectReference Include="..\..\src\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
</ItemGroup>
<Import Project="..\..\build\Serilog.props" />

1
src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
View File

@ -15,5 +15,6 @@
<ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
</ItemGroup>
<Import Project="..\..\build\Rx.props" />
<Import Project="..\..\build\EmbedXaml.props" />
<Import Project="..\..\build\JetBrains.Annotations.props" />
</Project>

1370
src/Avalonia.Controls.DataGrid/DataGrid.cs
View File

File diff suppressed because it is too large

6
src/Avalonia.Themes.Default/DataGrid.xaml → src/Avalonia.Controls.DataGrid/Default.xaml
View File

@ -1,5 +1,4 @@
<Styles xmlns="https://github.com/avaloniaui">
<!--TODO: Validation and Focus-->
<Style Selector="DataGridCell">
<Setter Property="Background" Value="Transparent"/>
@ -25,7 +24,6 @@
</Setter>
</Style>
<!--FIX-->
<Style Selector="DataGridColumnHeader">
<Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
<Setter Property="HorizontalContentAlignment" Value="Left" />
@ -94,7 +92,6 @@
</Setter>
</Style>
<!--FIX-->
<Style Selector="DataGridRow">
<Setter Property="Template">
<ControlTemplate>
@ -114,7 +111,6 @@
</Setter>
</Style>
<!--FIX-->
<Style Selector="DataGridRow /template/ Rectangle#BackgroundRectangle">
<Setter Property="IsVisible" Value="False"/>
<Setter Property="Fill" Value="#FFBADDE9" />
@ -130,7 +126,6 @@
<Setter Property="Opacity" Value="1"/>
</Style>
<!--FIX-->
<Style Selector="DataGridRowHeader">
<Setter Property="Template">
<ControlTemplate>
@ -189,7 +184,6 @@
</Setter>
</Style>
<!--FIX-->
<Style Selector="DataGrid">
<Setter Property="RowBackground" Value="{DynamicResource ThemeAccentBrush4}" />
<Setter Property="AlternatingRowBackground" Value="#00FFFFFF" />

1
src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
View File

@ -7,7 +7,6 @@
<ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
<ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
<ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
<ProjectReference Include="..\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
<ProjectReference Include="..\Avalonia.Input\Avalonia.Input.csproj" />
<ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
<ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />

1
src/Avalonia.Themes.Default/DefaultTheme.xaml
View File

@ -46,5 +46,4 @@
<StyleInclude Source="resm:Avalonia.Themes.Default.ButtonSpinner.xaml?assembly=Avalonia.Themes.Default"/>
<StyleInclude Source="resm:Avalonia.Themes.Default.NumericUpDown.xaml?assembly=Avalonia.Themes.Default"/>
<StyleInclude Source="resm:Avalonia.Themes.Default.AutoCompleteBox.xaml?assembly=Avalonia.Themes.Default"/>
<StyleInclude Source="resm:Avalonia.Themes.Default.DataGrid.xaml?assembly=Avalonia.Themes.Default"/>
</Styles>

1
src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
View File

@ -58,7 +58,6 @@
<ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj" />
<ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
<ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />
<ProjectReference Include="..\..\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
<ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" />
<ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
<ProjectReference Include="..\..\Avalonia.Layout\Avalonia.Layout.csproj" />

1
src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaRuntimeTypeProvider.cs
View File

@ -38,7 +38,6 @@ namespace Avalonia.Markup.Xaml.Context
typeof(DataTemplate).GetTypeInfo().Assembly,
typeof(SolidColorBrush).GetTypeInfo().Assembly,
typeof(Binding).GetTypeInfo().Assembly,
typeof(DataGrid).GetTypeInfo().Assembly
};
private Dictionary<string, HashSet<ClrNamespaceInfo>> _namespaces = new Dictionary<string, HashSet<ClrNamespaceInfo>>();

Write Preview
Loading…
Cancel
Save