diff --git a/src/AtomUI.Theme/Assets/Themes/DaybreakBlueLight.xml b/src/AtomUI.Theme/Assets/Themes/DaybreakBlueLight.xml index 3a872ebc2..9b4211840 100644 --- a/src/AtomUI.Theme/Assets/Themes/DaybreakBlueLight.xml +++ b/src/AtomUI.Theme/Assets/Themes/DaybreakBlueLight.xml @@ -2,6 +2,8 @@ DefaultAlgorithm + + diff --git a/src/AtomUI.Theme/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/TokenResourceConst.g.cs b/src/AtomUI.Theme/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/TokenResourceConst.g.cs index ac9263825..af253247d 100644 --- a/src/AtomUI.Theme/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/TokenResourceConst.g.cs +++ b/src/AtomUI.Theme/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/TokenResourceConst.g.cs @@ -202,7 +202,8 @@ namespace AtomUI.Theme.Styling public static readonly TokenResourceKey MotionUnit = new TokenResourceKey("MotionUnit"); public static readonly TokenResourceKey MotionBase = new TokenResourceKey("MotionBase"); public static readonly TokenResourceKey Wireframe = new TokenResourceKey("Wireframe"); - public static readonly TokenResourceKey Motion = new TokenResourceKey("Motion"); + public static readonly TokenResourceKey EnableMotion = new TokenResourceKey("EnableMotion"); + public static readonly TokenResourceKey EnableWaveAnimation = new TokenResourceKey("EnableWaveAnimation"); public static readonly TokenResourceKey SizeXXL = new TokenResourceKey("SizeXXL"); public static readonly TokenResourceKey SizeXL = new TokenResourceKey("SizeXL"); public static readonly TokenResourceKey SizeLG = new TokenResourceKey("SizeLG"); diff --git a/src/AtomUI.Theme/ThemeDefinitionReader.cs b/src/AtomUI.Theme/ThemeDefinitionReader.cs index f84db4049..e804d73b3 100644 --- a/src/AtomUI.Theme/ThemeDefinitionReader.cs +++ b/src/AtomUI.Theme/ThemeDefinitionReader.cs @@ -120,7 +120,7 @@ internal class ThemeDefinitionReader } else { - EmitErrorMsg(reader, $"Element tag: {string.Join('.', _currentElementNames)} not supported."); + EmitErrorMsg(reader, $"Element tag: {string.Join('.', _currentElementNames.Reverse())} not supported."); } } diff --git a/src/AtomUI.Theme/TokenSystem/TokenDefinitions/DesignToken.Seed.cs b/src/AtomUI.Theme/TokenSystem/TokenDefinitions/DesignToken.Seed.cs index 2e821be9f..375cf127e 100644 --- a/src/AtomUI.Theme/TokenSystem/TokenDefinitions/DesignToken.Seed.cs +++ b/src/AtomUI.Theme/TokenSystem/TokenDefinitions/DesignToken.Seed.cs @@ -142,7 +142,6 @@ public partial class DesignToken public double OpacityImage { get; set; } = 1.0; // ---------- motion ---------- // - // TODO: 缺一个懂 motion 的人来收敛 Motion 相关的 Token /// /// 动画时长变化单位 /// 用于控制动画时长的变化单位 @@ -157,13 +156,22 @@ public partial class DesignToken // ---------- Style ---------- // /// /// 线框风格 + /// /// 用于将组件的视觉效果变为线框化,如果需要使用 V4 的效果,需要开启配置项 /// public bool Wireframe { get; set; } = false; /// /// 动画风格 + /// /// 用于配置动画效果,为 `false` 时则关闭动画 /// - public bool Motion { get; set; } = true; + public bool EnableMotion { get; set; } = true; + + /// + /// 是否开启波浪动画 + /// + /// 按钮,单选按钮等点击后的波浪动画效果 + /// + public bool EnableWaveAnimation { get; set; } = true; } \ No newline at end of file diff --git a/src/AtomUI.Theme/TokenSystem/TokenDefinitions/DesignToken.cs b/src/AtomUI.Theme/TokenSystem/TokenDefinitions/DesignToken.cs index b31b25245..37973c730 100644 --- a/src/AtomUI.Theme/TokenSystem/TokenDefinitions/DesignToken.cs +++ b/src/AtomUI.Theme/TokenSystem/TokenDefinitions/DesignToken.cs @@ -93,7 +93,7 @@ public partial class DesignToken : AbstractDesignToken var screenXXL = 1600; // Motion - if (!Motion) + if (!EnableMotion) { MotionDurationFast = TimeSpan.FromMilliseconds(0); MotionDurationMid = TimeSpan.FromMilliseconds(0);