Skip to content

Commit 3bc2cdf

Browse files
ghost1372ghost1372
committed
Merge branch 'master' into develop
2 parents c10a050 + ec16bcc commit 3bc2cdf

212 files changed

Lines changed: 16417 additions & 128 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
packages/
88
build/outputs
99
build/tools
10+
.DS_Store

‎LICENSE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
MIT License
1+
MIT License
22

3-
Copyright © HandyOrg 2018-2025
3+
Copyright © HandyOrg 2018-2026
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎src/Avalonia/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<Nullable>enable</Nullable>
44
<LangVersion>latest</LangVersion>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<AvaloniaVersion>11.3.6</AvaloniaVersion>
77
</PropertyGroup>
88
</Project>

‎src/Avalonia/HandyControlDemo_Avalonia/Data/DemoInfo.json‎

Lines changed: 23 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
[
1+
[
22
{
33
"title": "Styles",
44
"selectedIndex": 0,
55
"group": false,
66
"demoItemList": [
77
[ "Brush", "BrushDemo", "Brush.Brush", "", "" ],
88
[ "Button", "ButtonDemo", "Brush.ButtonClick", "", "" ],
9+
[ "SplitButton", "SplitButtonDemo", "Brush.ButtonClick", "", "" ],
10+
[ "DropDownButton", "DropDownButtonDemo", "Brush.ButtonClick", "", "" ],
911
[ "RepeatButton", "RepeatButtonDemo", "Brush.RepeatButton", "", "" ],
1012
[ "ToggleButton", "ToggleButtonDemo", "Brush.Toggle", "", "" ],
13+
[ "ToggleSwitch", "ToggleSwitchDemo", "Brush.Toggle", "", "" ],
1114
[ "RadioButton", "RadioButtonDemo", "Brush.RadioButton", "", "" ],
1215
[ "HyperlinkButton", "HyperlinkButtonDemo", "Brush.Hyperlink", "", "" ],
1316
[ "CheckBox", "CheckBoxDemo", "Brush.CheckBoxChecked", "", "" ],
@@ -16,11 +19,15 @@
1619
[ "TextBlock", "TextBlockDemo", "Brush.TextBlock", "", "" ],
1720
[ "NumericUpDown", "NumericUpDownDemo", "Brush.NumericListBox", "", "" ],
1821
[ "TextBox", "TextBoxDemo", "Brush.TextBox", "", "" ],
22+
[ "MaskedTextBox", "MaskedTextBoxDemo", "Brush.TextBox", "", "" ],
1923
[ "AutoCompleteBox", "AutoCompleteBoxDemo", "Brush.AutoComplete", "", "" ],
2024
[ "ComboBox", "ComboBoxDemo", "Brush.ComboBox", "", "" ],
2125
[ "Expander", "ExpanderDemo", "Brush.Expander", "", "" ],
2226
[ "ProgressBar", "NativeProgressBarDemo", "Brush.ProgressBar", "", "" ],
2327
[ "Calendar", "CalendarDemo", "Brush.Calendar", "", "" ],
28+
[ "CalendarDatePicker", "CalendarDatePickerDemo", "Brush.Calendar", "", "" ],
29+
[ "DatePicker", "DatePickerDemo", "Brush.Calendar", "", "" ],
30+
[ "TimePicker", "TimePickerDemo", "Brush.Calendar", "", "" ],
2431
[ "TabControl", "NativeTabControlDemo", "Brush.TabPage", "", "" ],
2532
[ "TreeView", "TreeViewDemo", "Brush.TreeView", "", "" ],
2633
[ "ListBox", "ListBoxDemo", "Brush.ListBox", "", "" ],
@@ -34,82 +41,32 @@
3441
"selectedIndex": 0,
3542
"group": true,
3643
"demoItemList": [
37-
[ "FloatingBlock", "FloatingBlockDemo", "Brush.LikeFilled", "", "Interacting" ],
38-
[ "PropertyGrid", "PropertyGridDemo", "Brush.PropertyGridEditorPart", "", "DataEntry" ],
39-
[ "ImageSelector", "ImageSelectorDemo", "Brush.Image", "", "DataEntry" ],
40-
[ "ImageBlock", "ImageBlockDemo", "Brush.ImageStack", "", "DataDisplay" ],
41-
[ "Magnifier", "MagnifierDemo", "Brush.Search", "", "Interacting" ],
44+
[ "ConfettiCannon", "ConfettiCannonDemo", "Brush.Favorite", "", "Interacting" ],
45+
[ "Dialog", "DialogDemo", "Brush.Dialog", "", "Feedback" ],
4246
[ "Gravatar", "GravatarDemo", "Brush.User", "", "DataDisplay" ],
43-
[ "Badge", "BadgeDemo", "Brush.CheckDot", "", "DataDisplay" ],
44-
[ "SplitButton", "SplitButtonDemo", "Brush.SplitButton", "", "Button" ],
4547
[ "ButtonGroup", "ButtonGroupDemo", "Brush.ButtonGroup", "", "Button" ],
4648
[ "ProgressButton", "ProgressButtonDemo", "Brush.ProgressBarStatusBar8", "", "Button" ],
47-
[ "Poptip", "PoptipDemo", "Brush.ToolTip", "", "DataDisplay" ],
48-
[ "CheckComboBox", "CheckComboBoxDemo", "Brush.CheckBoxList", "", "DataEntry" ],
49-
[ "AutoCompleteTextBox", "AutoCompleteTextBoxDemo", "Brush.AutoComplete", "1", "DataEntry" ],
49+
[ "Card", "CardDemo", "Brush.ContactCard", "", "DataDisplay" ],
50+
[ "GotoTop", "GotoTopDemo", "Brush.GoToTop", "", "Interacting" ],
5051
[ "PinBox", "PinBoxDemo", "Brush.Ellipsis", "", "DataEntry" ],
51-
[ "Clock", "ClockDemo", "Brush.Time", "", "DataEntry" ],
52-
[ "TimePicker", "TimePickerDemo", "Brush.TimePicker", "", "DataEntry" ],
53-
[ "CalendarWithClock", "CalendarWithClockDemo", "Brush.Calendar", "", "DataEntry" ],
54-
[ "DateTimePicker", "DateTimePickerDemo", "Brush.DateTimePicker", "", "DataEntry" ],
55-
[ "Transfer", "TransferDemo", "Brush.SyncArrow", "", "DataEntry" ],
56-
[ "FlipClock", "FlipClockDemo", "Brush.FlipVertical", "", "DataDisplay" ],
57-
[ "Rate", "RateDemo", "Brush.HeartFilled", "", "DataEntry" ],
58-
[ "Shield", "ShieldDemo", "Brush.SplitKeyValuePair", "", "DataDisplay" ],
5952
[ "SearchBar", "SearchBarDemo", "Brush.Search", "", "DataEntry" ],
60-
[ "Tag", "TagDemo", "Brush.Tag", "", "DataDisplay" ],
61-
[ "GifImage", "GifImageDemo", "Brush.Animation", "", "DataDisplay" ],
62-
[ "OutlineText", "OutlineTextDemo", "Brush.TextBlock", "", "DataDisplay" ],
63-
[ "RunningBlock", "RunningBlockDemo", "Brush.Dynamic", "", "DataDisplay" ],
64-
[ "Card", "CardDemo", "Brush.ContactCard", "", "DataDisplay" ],
65-
[ "ElementGroup", "ElementGroupDemo", "Brush.ButtonGroup", "1", "Layout" ],
66-
[ "Divider", "DividerDemo", "Brush.DottedSplitter", "", "Layout" ],
53+
[ "ElementGroup", "ElementGroupDemo", "Brush.ButtonGroup", "", "Layout" ],
6754
[ "CirclePanel", "CirclePanelDemo", "Brush.ColorWheel", "", "Layout" ],
6855
[ "Grid", "GridDemo", "Brush.GridPane", "", "Layout" ],
69-
[ "FlexPanel", "FlexPanelDemo", "Brush.FlowLayoutPanel", "1", "Layout" ],
70-
[ "UniformSpacingPanel", "UniformSpacingPanelDemo", "Brush.IncreaseHorizontalSpacing", "1", "Layout" ],
71-
[ "RelativePanel", "RelativePanelDemo", "Brush.TransformRelative", "", "Layout" ],
56+
[ "FlexPanel", "FlexPanelDemo", "Brush.FlowLayoutPanel", "", "Layout" ],
7257
[ "WaterfallPanel", "WaterfallPanelDemo", "Brush.Panel", "", "Layout" ],
7358
[ "HoneycombPanel", "HoneycombPanelDemo", "Brush.PolygonHexagon", "", "Layout" ],
74-
[ "TransitioningContentControl", "TransitioningContentControlDemo", "Brush.TransitioningContentControl", "", "Interacting" ],
75-
[ "Drawer", "DrawerDemo", "Brush.TransactedReceiveScope", "", "Feedback" ],
76-
[ "CoverView", "CoverViewDemo", "Brush.DetailDataView", "", "DataDisplay" ],
77-
[ "CoverFlow", "CoverFlowDemo", "Brush.LinearCarousel", "", "DataDisplay" ],
59+
[ "UniformSpacingPanel", "UniformSpacingPanelDemo", "Brush.IncreaseHorizontalSpacing", "", "Layout" ],
7860
[ "ProgressBar", "ProgressBarDemo", "Brush.ProgressBar", "", "Feedback" ],
79-
[ "StepBar", "StepBarDemo", "Brush.Flow", "", "Navigation" ],
80-
[ "Growl", "GrowlDemo", "Brush.Message", "", "Feedback" ],
81-
[ "Loading", "LoadingDemo", "Brush.Loading", "", "Feedback" ],
82-
[ "ColorPicker", "ColorPickerDemo", "Brush.ColorPalette", "", "DataEntry" ],
83-
[ "Carousel", "CarouselDemo", "Brush.Carousel", "", "DataDisplay" ],
84-
[ "CompareSlider", "CompareSliderDemo", "Brush.SplitterControl", "", "Interacting" ],
85-
[ "PreviewSlider", "PreviewSliderDemo", "Brush.HoverMenu", "", "DataEntry" ],
86-
[ "RangeSlider", "RangeSliderDemo", "Brush.Indexer", "", "DataEntry" ],
87-
[ "TimeBar", "TimeBarDemo", "Brush.Timeline", "", "DataEntry" ],
61+
[ "Rate", "RateDemo", "Brush.Favorite", "", "Feedback" ],
8862
[ "Pagination", "PaginationDemo", "Brush.Paginator", "", "Navigation" ],
89-
[ "TabControl", "TabControlDemo", "Brush.TabPage", "", "DataDisplay" ],
90-
[ "SideMenu", "SideMenuDemo", "Brush.MainMenuControl", "", "Navigation" ],
91-
[ "Notification", "NotificationDemo", "Brush.Procedure", "", "Feedback" ],
92-
[ "Dialog", "DialogDemo", "Brush.Dialog", "", "Feedback" ],
93-
[ "Screenshot", "ScreenshotDemo", "Brush.WindowScreenshot", "", "" ],
94-
[ "GotoTop", "GotoTopDemo", "Brush.GoToTop", "", "" ],
95-
[ "ChatBubble", "ChatBubbleDemo", "Brush.FeedbackBubble", "", "" ],
96-
[ "Watermark", "WatermarkDemo", "Brush.GridLight", "1", "" ],
97-
[ "NotifyIcon", "NotifyIconDemo", "Brush.NotificationHub", "", "" ],
98-
[ "ImageBrowser", "ImageBrowserDemo", "Brush.ImageBrowser", "", "" ],
99-
[ "AnimationPath", "AnimationPathDemo", "Brush.Path", "", "" ],
100-
[ "ScrollViewer", "ScrollViewerDemo", "Brush.ScrollBox", "", "" ],
101-
[ "Sprite", "SpriteDemo", "Brush.HandyControl", "", "" ],
102-
[ "Window", "WindowDemo", "Brush.WindowsForm", "", "" ]
103-
]
104-
},
105-
{
106-
"title": "Tools",
107-
"selectedIndex": 0,
108-
"group": false,
109-
"demoItemList": [
110-
[ "HatchBrushGenerator", "HatchBrushGeneratorDemo", "Brush.DataGenerator", "", "" ],
111-
[ "MorphingAnimation", "GeometryAnimationDemo", "Brush.Animation", "", "" ],
112-
[ "Effects", "EffectsDemo", "Brush.Effects", "", "" ]
63+
[ "Loading", "LoadingDemo", "Brush.Loading", "", "Feedback" ],
64+
[ "Tag", "TagDemo", "Brush.Tag", "", "DataDisplay" ],
65+
[ "Badge", "BadgeDemo", "Brush.CheckDot", "", "DataDisplay" ],
66+
[ "Shield", "ShieldDemo", "Brush.SplitKeyValuePair", "", "DataDisplay" ],
67+
[ "ImageBlock", "ImageBlockDemo", "Brush.ImageStack", "", "DataDisplay" ],
68+
[ "AnimationPath", "AnimationPathDemo", "Brush.Path", "", "DataDisplay" ],
69+
[ "ImageSelector", "ImageSelectorDemo", "Brush.Image", "", "DataEntry" ]
11370
]
11471
}
11572
]

‎src/Avalonia/HandyControlDemo_Avalonia/Data/Model/CardModel.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
namespace HandyControlDemo.Data;
2+
3+
public class CardModel
4+
{
5+
public string? Header { get; set; }
6+
7+
public string? Content { get; set; }
8+
9+
public string? Footer { get; set; }
10+
}

‎src/Avalonia/HandyControlDemo_Avalonia/HandyControlDemo_Avalonia.csproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
44
<!--If you are willing to use Windows/MacOS native APIs you will need to create 3 projects.
@@ -18,13 +18,19 @@
1818
<ItemGroup>
1919
<None Remove="Data\DemoInfo.json" />
2020
<None Remove="Resources\Img\cloud.png" />
21+
<None Remove="Resources\Img\Dance.png" />
2122
<None Remove="Resources\Img\icon.ico" />
23+
<None Remove="Resources\Img\Avatar\*.png" />
24+
<None Remove="Resources\Img\Album\*.jpg" />
2225
</ItemGroup>
2326

2427
<ItemGroup>
2528
<EmbeddedResource Include="Data\DemoInfo.json" />
2629
<AvaloniaResource Include="Resources\Img\cloud.png" />
30+
<AvaloniaResource Include="Resources\Img\Dance.png" />
2731
<AvaloniaResource Include="Resources\Img\icon.ico" />
32+
<AvaloniaResource Include="Resources\Img\Avatar\*.png" />
33+
<AvaloniaResource Include="Resources\Img\Album\*.jpg" />
2834
</ItemGroup>
2935

3036
<ItemGroup>

‎src/Avalonia/HandyControlDemo_Avalonia/MainWindow.axaml.cs‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
using Avalonia.Controls;
22
using Avalonia.Interactivity;
3+
using HandyControl.Controls;
4+
using HandyControlDemo.Data;
35
using HandyControlDemo.UserControl;
46
using HandyControlDemo.ViewModel;
57

68
namespace HandyControlDemo;
79

8-
public partial class MainWindow : Window
10+
public partial class MainWindow : Avalonia.Controls.Window
911
{
10-
public MainWindow() => InitializeComponent();
12+
public MainWindow()
13+
{
14+
InitializeComponent();
15+
16+
Dialog.SetToken(this, MessageToken.MainWindow);
17+
}
1118

1219
protected override void OnLoaded(RoutedEventArgs e)
1320
{

‎src/Avalonia/HandyControlDemo_Avalonia/Resources/Img/Album/1.jpg‎

7.39 KB
Loading

‎src/Avalonia/HandyControlDemo_Avalonia/Resources/Img/Album/10.jpg‎

5.34 KB
Loading

‎src/Avalonia/HandyControlDemo_Avalonia/Resources/Img/Album/2.jpg‎

4.63 KB
Loading

0 commit comments

Comments
 (0)