Skip to content

Commit e2961ce

Browse files
committed
Change CircleManu to CircleManu
Change CircleManu to CircleManu
1 parent 3fda4b8 commit e2961ce

File tree

21 files changed

+60
-183
lines changed

21 files changed

+60
-183
lines changed
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<UserControl
2+
x:Class="WPFDevelopers.Samples.ExampleViews.CircleMenuExample"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
6+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
7+
xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
8+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9+
xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
10+
d:DesignHeight="450"
11+
d:DesignWidth="800"
12+
mc:Ignorable="d">
13+
<controls:CodeViewer>
14+
<StackPanel Background="Black">
15+
<TextBlock
16+
Margin="50,10,0,20"
17+
FontSize="40"
18+
FontWeight="Bold"
19+
Foreground="#A9CC32"
20+
Text="微信公众号:WPFDevelopers" />
21+
<wd:CircleMenu ItemsSource="{Binding MenuArray, RelativeSource={RelativeSource AncestorType=local:CircleMenuExample}}" SelectionChanged="CircleMenu_SelectionChanged" />
22+
</StackPanel>
23+
<controls:CodeViewer.SourceCodes>
24+
<controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/CircleMenuExample.xaml" CodeType="Xaml" />
25+
<controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/CircleMenuExample.xaml.cs" CodeType="CSharp" />
26+
</controls:CodeViewer.SourceCodes>
27+
</controls:CodeViewer>
28+
</UserControl>

src/WPFDevelopers.Samples.Shared/ExampleViews/CircularMenuExample.xaml.cs renamed to src/WPFDevelopers.Samples.Shared/ExampleViews/CircleMenuExample.xaml.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
namespace WPFDevelopers.Samples.ExampleViews
1212
{
1313
/// <summary>
14-
/// CircularMenuExample.xaml 的交互逻辑
14+
/// CircleMenuExample.xaml 的交互逻辑
1515
/// </summary>
16-
public partial class CircularMenuExample : UserControl
16+
public partial class CircleMenuExample : UserControl
1717
{
1818
public IEnumerable MenuArray
1919
{
@@ -22,25 +22,25 @@ public IEnumerable MenuArray
2222
}
2323

2424
public static readonly DependencyProperty MenuArrayProperty =
25-
DependencyProperty.Register("MenuArray", typeof(IEnumerable), typeof(MainWindow), new PropertyMetadata(null));
26-
public CircularMenuExample()
25+
DependencyProperty.Register("MenuArray", typeof(IEnumerable), typeof(CircleMenuExample), new PropertyMetadata(null));
26+
public CircleMenuExample()
2727
{
2828
InitializeComponent();
2929

3030
var angle = 0;
3131
var menuItemModels = new List<MenuItemModel>();
3232
for (int i = 1; i <= 8; i++)
3333
{
34-
menuItemModels.Add(new MenuItemModel { Angle = angle, Title = $"菜单{i}", IconImage = new BitmapImage(new Uri($"pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/{i}.png")) });
34+
menuItemModels.Add(new MenuItemModel { Angle = angle, Title = $"菜单{i}", IconImage = new BitmapImage(new Uri($"pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircleMenu/{i}.png")) });
3535
angle += 45;
3636
}
3737
MenuArray = menuItemModels;
3838
}
3939

40-
private void CircularMenu_SelectionChanged(object sender, SelectionChangedEventArgs e)
40+
private void CircleMenu_SelectionChanged(object sender, SelectionChangedEventArgs e)
4141
{
42-
var circularMenu = sender as CircularMenu;
43-
MenuItemModel menuItemModel = circularMenu.SelectedItem as MenuItemModel;
42+
var circularMenu = sender as CircleMenu;
43+
var menuItemModel = circularMenu.SelectedItem as MenuItemModel;
4444
MessageBox.Show($"点击了{menuItemModel.Title}");
4545
}
4646

src/WPFDevelopers.Samples.Shared/ExampleViews/CircularMenuExample.xaml

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public enum MenuEnum
2222
AMap,
2323
TransformLayout,
2424
VerifyCode,
25-
CircularMenu,
25+
CircleMenu,
2626
ChatEmoji,
2727
ProgressBar,
2828
Dashboard,

0 commit comments

Comments
 (0)