Selaa lähdekoodia

Rename FluentControls

Max Katz 4 vuotta sitten
vanhempi
sitoutus
e8c40d4275

+ 1 - 1
samples/ControlCatalog/MainWindow.xaml.cs

@@ -67,7 +67,7 @@ namespace ControlCatalog
             if (Application.Current.Styles.Contains(App.FluentDark)
                 || 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 _);
             }
             else

+ 0 - 1
src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj

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

+ 1 - 1
src/Avalonia.Themes.Fluent/Controls/FluentTheme.xaml → src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml

@@ -1,6 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         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) -->  
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToolTip.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml"/>

+ 1 - 1
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>
     /// The default Avalonia theme.
     /// </summary>
-    public class FluentTheme : Styles
+    public class FluentControls : Styles
     {
     }
 }

+ 1 - 1
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/FluentBaseDark.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>

+ 1 - 1
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/FluentBaseLight.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>