diff --git a/src/Avalonia/HandyControlDemo_Avalonia/Data/DemoInfo.json b/src/Avalonia/HandyControlDemo_Avalonia/Data/DemoInfo.json index 24d804d2..3a0ecbee 100644 --- a/src/Avalonia/HandyControlDemo_Avalonia/Data/DemoInfo.json +++ b/src/Avalonia/HandyControlDemo_Avalonia/Data/DemoInfo.json @@ -7,6 +7,7 @@ [ "Brush", "BrushDemo", "Brush.Brush", "", "" ], [ "Button", "ButtonDemo", "Brush.ButtonClick", "", "" ], [ "SplitButton", "SplitButtonDemo", "Brush.ButtonClick", "", "" ], + [ "DropDownButton", "DropDownButtonDemo", "Brush.ButtonClick", "", "" ], [ "RepeatButton", "RepeatButtonDemo", "Brush.RepeatButton", "", "" ], [ "ToggleButton", "ToggleButtonDemo", "Brush.Toggle", "", "" ], [ "ToggleSwitch", "ToggleSwitchDemo", "Brush.Toggle", "", "" ], diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/DropDownButtonDemo.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/DropDownButtonDemo.axaml new file mode 100644 index 00000000..2ff06a3a --- /dev/null +++ b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/DropDownButtonDemo.axaml @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/DropDownButtonDemo.axaml.cs b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/DropDownButtonDemo.axaml.cs new file mode 100644 index 00000000..265d67d2 --- /dev/null +++ b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/DropDownButtonDemo.axaml.cs @@ -0,0 +1,9 @@ +namespace HandyControlDemo.UserControl; + +public partial class DropDownButtonDemo : Avalonia.Controls.UserControl +{ + public DropDownButtonDemo() + { + InitializeComponent(); + } +} diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/SplitButtonDemo.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/SplitButtonDemo.axaml index e935312e..8f50705f 100644 --- a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/SplitButtonDemo.axaml +++ b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/SplitButtonDemo.axaml @@ -8,116 +8,401 @@ Spacing="32" Margin="32"> - + Spacing="32"> - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + Spacing="32"> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/DropDownButton.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/DropDownButton.axaml new file mode 100644 index 00000000..d05808a2 --- /dev/null +++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/DropDownButton.axaml @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/MergedStyles.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/MergedStyles.axaml index d13324de..41aad7f3 100644 --- a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/MergedStyles.axaml +++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/MergedStyles.axaml @@ -33,6 +33,7 @@ + diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/SplitButton.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/SplitButton.axaml index 15251239..12c2f1c7 100644 --- a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/SplitButton.axaml +++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/SplitButton.axaml @@ -40,28 +40,18 @@ - - - - @@ -196,6 +186,116 @@ Value="12" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +