GithubStar/AtomUI
1
0
Fork 0
mirror of https://github.com/AtomUI/AtomUI.git synced 2026-10-29 07:16:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor InfoPickerInput

Browse Source
This commit is contained in:
CHINBOY
2025-06-13 11:32:10 +08:00
parent c8eeffe2a7
commit b6ec38e2b2
19 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AtomUI.Controls/AtomUI.Controls.csproj
+4
View File
@@ -36,4 +36,8 @@
<AdditionalFiles Include="Buttons\Themes\Button\TextButtonTheme.axaml" />
</ItemGroup>
<ItemGroup>
<Folder Include="Internal\" />
</ItemGroup>
</Project>
src/AtomUI.Controls/DatePicker/DatePicker.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using System.Globalization;
using AtomUI.Controls.CalendarView;
using AtomUI.Controls.Internal;
using AtomUI.Controls.Primitives;
using AtomUI.Controls.TimePickerLang;
using AtomUI.Data;
using AtomUI.Media;
src/AtomUI.Controls/DatePicker/DatePickerTheme.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using AtomUI.Controls.Internal;
using AtomUI.Controls.Primitives;
using AtomUI.IconPkg;
using AtomUI.IconPkg.AntDesign;
using AtomUI.Theme.Styling;
src/AtomUI.Controls/DatePicker/RangeDatePicker.cs
+1 -2
View File
@@ -1,6 +1,6 @@
using System.Globalization;
using AtomUI.Controls.CalendarView;
using AtomUI.Controls.Internal;
using AtomUI.Controls.Primitives;
using AtomUI.Controls.TimePickerLang;
using AtomUI.Data;
using AtomUI.Media;
@@ -9,7 +9,6 @@ using AtomUI.Theme.Data;
using AtomUI.Theme.Utils;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.Primitives;
using Avalonia.Data;
using Avalonia.LogicalTree;
using Avalonia.VisualTree;
src/AtomUI.Controls/DatePicker/RangeDatePickerTheme.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using AtomUI.Controls.Internal;
using AtomUI.Controls.Primitives;
using AtomUI.IconPkg;
using AtomUI.IconPkg.AntDesign;
using AtomUI.Theme.Styling;
src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.ControlThemePoolGenerator/ControlThemePool.g.cs
+1 -2
View File
@@ -46,7 +46,6 @@ namespace AtomUI.Theme
themes.Add(new AtomUI.Controls.HorizontalNavMenuTheme());
themes.Add(new AtomUI.Controls.HyperLinkTextBlockTheme());
themes.Add(new AtomUI.Controls.InlineNavMenuItemTheme());
themes.Add(new AtomUI.Controls.Internal.RangeInfoPickerInputTheme());
themes.Add(new AtomUI.Controls.ListBoxItemTheme());
themes.Add(new AtomUI.Controls.ListBoxTheme());
themes.Add(new AtomUI.Controls.LoadingIndicatorAdornerTheme());
@@ -63,11 +62,11 @@ namespace AtomUI.Theme
themes.Add(new AtomUI.Controls.OptionButtonGroupTheme());
themes.Add(new AtomUI.Controls.OptionButtonTheme());
themes.Add(new AtomUI.Controls.PickerClearUpButtonTheme());
themes.Add(new AtomUI.Controls.Primitives.RangeInfoPickerInputTheme());
themes.Add(new AtomUI.Controls.ProgressBarTheme());
themes.Add(new AtomUI.Controls.RangeDatePickerFlyoutPresenterTheme());
themes.Add(new AtomUI.Controls.RangeDatePickerTheme());
themes.Add(new AtomUI.Controls.RangeTimePickerTheme());
themes.Add(new AtomUI.Controls.SearchEditTheme());
themes.Add(new AtomUI.Controls.SegmentedItemTheme());
themes.Add(new AtomUI.Controls.SegmentedTheme());
themes.Add(new AtomUI.Controls.SeparatorTheme());
src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/ControlTokenTypePool.g.cs
+1 -1
View File
@@ -25,7 +25,6 @@ namespace AtomUI.Theme
tokenTypes.Add(typeof(AtomUI.Controls.ExpanderToken));
tokenTypes.Add(typeof(AtomUI.Controls.FlyoutPresenterToken));
tokenTypes.Add(typeof(AtomUI.Controls.GroupBoxToken));
tokenTypes.Add(typeof(AtomUI.Controls.Internal.InfoPickerInputToken));
tokenTypes.Add(typeof(AtomUI.Controls.LineEditToken));
tokenTypes.Add(typeof(AtomUI.Controls.ListBoxToken));
tokenTypes.Add(typeof(AtomUI.Controls.LoadingIndicatorToken));
@@ -38,6 +37,7 @@ namespace AtomUI.Theme
tokenTypes.Add(typeof(AtomUI.Controls.OptionButtonToken));
tokenTypes.Add(typeof(AtomUI.Controls.PaginationToken));
tokenTypes.Add(typeof(AtomUI.Controls.PopupConfirmToken));
tokenTypes.Add(typeof(AtomUI.Controls.Primitives.InfoPickerInputToken));
tokenTypes.Add(typeof(AtomUI.Controls.ProgressBarToken));
tokenTypes.Add(typeof(AtomUI.Controls.RadioButtonToken));
tokenTypes.Add(typeof(AtomUI.Controls.ScrollBarToken));
src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/TokenResourceConst.g.cs
+6 -6
View File
@@ -294,12 +294,6 @@ namespace AtomUI.Theme.Styling
public static readonly TokenResourceKey WarningActiveShadow = new TokenResourceKey("LineEdit.WarningActiveShadow");
}
public static class InfoPickerInputTokenKey
{
public static readonly TokenResourceKey RangePickerArrowMargin = new TokenResourceKey("InfoPickerInput.RangePickerArrowMargin");
public static readonly TokenResourceKey RangePickerIndicatorThickness = new TokenResourceKey("InfoPickerInput.RangePickerIndicatorThickness");
}
public static class ListBoxTokenKey
{
public static readonly TokenResourceKey ContentPadding = new TokenResourceKey("ListBox.ContentPadding");
@@ -533,6 +527,12 @@ namespace AtomUI.Theme.Styling
public static readonly TokenResourceKey TitleMargin = new TokenResourceKey("PopupConfirm.TitleMargin");
}
public static class InfoPickerInputTokenKey
{
public static readonly TokenResourceKey RangePickerArrowMargin = new TokenResourceKey("InfoPickerInput.RangePickerArrowMargin");
public static readonly TokenResourceKey RangePickerIndicatorThickness = new TokenResourceKey("InfoPickerInput.RangePickerIndicatorThickness");
}
public static class ProgressBarTokenKey
{
public static readonly TokenResourceKey CircleMinimumIconSize = new TokenResourceKey("ProgressBar.CircleMinimumIconSize");
src/AtomUI.Controls/Internal/InfoPickerInput/InfoPickerInput.cs → src/AtomUI.Controls/Primitives/InfoPickerInput/InfoPickerInput.cs
+1 -1
View File
@@ -11,7 +11,7 @@ using Avalonia.Input.Raw;
using Avalonia.LogicalTree;
using Avalonia.Media;
namespace AtomUI.Controls.Internal;
namespace AtomUI.Controls.Primitives;
[PseudoClasses(FlyoutOpenPC)]
public abstract class InfoPickerInput : TemplatedControl,
src/AtomUI.Controls/Internal/InfoPickerInput/InfoPickerInputTheme.cs → src/AtomUI.Controls/Primitives/InfoPickerInput/InfoPickerInputTheme.cs
+1 -1
View File
@@ -8,7 +8,7 @@ using Avalonia.Layout;
using Avalonia.Media;
using Avalonia.Styling;
namespace AtomUI.Controls.Internal;
namespace AtomUI.Controls.Primitives;
internal class InfoPickerInputTheme : BaseControlTheme
{
src/AtomUI.Controls/Internal/InfoPickerInput/InfoPickerInputToken.cs → src/AtomUI.Controls/Primitives/InfoPickerInput/InfoPickerInputToken.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using AtomUI.Theme.TokenSystem;
using Avalonia;
namespace AtomUI.Controls.Internal;
namespace AtomUI.Controls.Primitives;
[ControlDesignToken]
internal class InfoPickerInputToken : AbstractControlDesignToken
src/AtomUI.Controls/Internal/InfoPickerInput/PickerClearUpButton.cs → src/AtomUI.Controls/Primitives/InfoPickerInput/PickerClearUpButton.cs
View File
src/AtomUI.Controls/Internal/InfoPickerInput/PickerClearUpButtonTheme.cs → src/AtomUI.Controls/Primitives/InfoPickerInput/PickerClearUpButtonTheme.cs
View File
src/AtomUI.Controls/Internal/InfoPickerInput/RangeInfoPickerInput.cs → src/AtomUI.Controls/Primitives/InfoPickerInput/RangeInfoPickerInput.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using Avalonia.Controls.Shapes;
using Avalonia.Input.Raw;
using Avalonia.VisualTree;
namespace AtomUI.Controls.Internal;
namespace AtomUI.Controls.Primitives;
public abstract class RangeInfoPickerInput : InfoPickerInput
{
src/AtomUI.Controls/Internal/InfoPickerInput/RangeInfoPickerInputTheme.cs → src/AtomUI.Controls/Primitives/InfoPickerInput/RangeInfoPickerInputTheme.cs
+1 -1
View File
@@ -7,7 +7,7 @@ using Avalonia.Controls.Templates;
using Avalonia.Layout;
using Avalonia.Styling;
namespace AtomUI.Controls.Internal;
namespace AtomUI.Controls.Primitives;
[ControlThemeProvider]
internal class RangeInfoPickerInputTheme : InfoPickerInputTheme
src/AtomUI.Controls/TimePicker/RangeTimePicker.cs
+1 -2
View File
@@ -1,4 +1,4 @@
using AtomUI.Controls.Internal;
using AtomUI.Controls.Primitives;
using AtomUI.Controls.Utils;
using AtomUI.Data;
using AtomUI.Media;
@@ -6,7 +6,6 @@ using AtomUI.Theme;
using AtomUI.Theme.Utils;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.Primitives;
using Avalonia.Data;
using Avalonia.LogicalTree;
using Avalonia.VisualTree;
src/AtomUI.Controls/TimePicker/RangeTimePickerTheme.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using AtomUI.Controls.Internal;
using AtomUI.Controls.Primitives;
using AtomUI.IconPkg;
using AtomUI.IconPkg.AntDesign;
using AtomUI.Theme.Styling;
src/AtomUI.Controls/TimePicker/TimePicker.cs
+1 -2
View File
@@ -1,4 +1,4 @@
using AtomUI.Controls.Internal;
using AtomUI.Controls.Primitives;
using AtomUI.Controls.Utils;
using AtomUI.Data;
using AtomUI.Media;
@@ -6,7 +6,6 @@ using AtomUI.Theme;
using AtomUI.Theme.Utils;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.Primitives;
using Avalonia.LogicalTree;
namespace AtomUI.Controls;
src/AtomUI.Controls/TimePicker/TimePickerTheme.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using AtomUI.Controls.Internal;
using AtomUI.Controls.Primitives;
using AtomUI.IconPkg;
using AtomUI.IconPkg.AntDesign;
using AtomUI.Theme.Styling;