Browse Source

Rename FluentControls

pull/5118/head
Max Katz 6 years ago
parent
commit
e8c40d4275
  1. 2
      samples/ControlCatalog/MainWindow.xaml.cs
  2. 1
      src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
  3. 2
      src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
  4. 2
      src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml.cs
  5. 2
      src/Avalonia.Themes.Fluent/FluentDark.xaml
  6. 2
      src/Avalonia.Themes.Fluent/FluentLight.xaml

2
samples/ControlCatalog/MainWindow.xaml.cs

@ -67,7 +67,7 @@ namespace ControlCatalog
if (Application.Current.Styles.Contains(App.FluentDark) if (Application.Current.Styles.Contains(App.FluentDark)
|| Application.Current.Styles.Contains(App.FluentLight)) || Application.Current.Styles.Contains(App.FluentLight))
{ {
var theme = new Avalonia.Themes.Fluent.FluentTheme(); var theme = new Avalonia.Themes.Fluent.Controls.FluentControls();
theme.TryGetResource("Button", out _); theme.TryGetResource("Button", out _);
} }
else else

1
src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj

@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<BaselineAllAPICompatError>true</BaselineAllAPICompatError>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
src/Avalonia.Themes.Fluent/Controls/FluentTheme.xaml → src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml

@ -1,6 +1,6 @@
<Styles xmlns="https://github.com/avaloniaui" <Styles 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="Avalonia.Themes.Fluent.Controls.FluentTheme"> x:Class="Avalonia.Themes.Fluent.Controls.FluentControls">
<!-- Define ToolTip first so its styles can be overriden by other controls (e.g. TextBox) --> <!-- Define ToolTip first so its styles can be overriden by other controls (e.g. TextBox) -->
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToolTip.xaml"/> <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToolTip.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml"/> <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml"/>

2
src/Avalonia.Themes.Fluent/Controls/FluentTheme.xaml.cs → src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml.cs

@ -6,7 +6,7 @@ namespace Avalonia.Themes.Fluent.Controls
/// <summary> /// <summary>
/// The default Avalonia theme. /// The default Avalonia theme.
/// </summary> /// </summary>
public class FluentTheme : Styles public class FluentControls : Styles
{ {
} }
} }

2
src/Avalonia.Themes.Fluent/FluentDark.xaml

@ -5,5 +5,5 @@
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/Base.xaml" /> <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/Base.xaml" />
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml" /> <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml" />
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml" /> <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml" />
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FluentTheme.xaml" /> <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FluentControls.xaml" />
</Styles> </Styles>

2
src/Avalonia.Themes.Fluent/FluentLight.xaml

@ -5,5 +5,5 @@
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/Base.xaml" /> <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/Base.xaml" />
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml" /> <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml" />
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml" /> <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml" />
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FluentTheme.xaml" /> <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FluentControls.xaml" />
</Styles> </Styles>

Loading…
Cancel
Save