Skip to content

Commit 0d206ad

Browse files
yanjinhuagoodyanjinhuagood
authored
Merge pull request #38 from WPFDevelopersOrg/dev
update ThumbAngle
2 parents 23b39c7 + 77670cc commit 0d206ad

File tree

7 files changed

+70
-46
lines changed

7 files changed

+70
-46
lines changed

‎src/WPFDevelopers.Shared/Controls/ElementAdorner/ElementAdorner.cs‎ renamed to ‎src/WPFDevelopers.Samples.Shared/Controls/ElementAdorner/ElementAdorner.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Windows.Media;
77
using System.Windows.Shapes;
88

9-
namespace WPFDevelopers.Controls
9+
namespace WPFDevelopers.Samples.Controls
1010
{
1111
public class ElementAdorner : Adorner
1212
{

‎src/WPFDevelopers.Shared/Controls/ElementAdorner/ThumbAngle.cs‎ renamed to ‎src/WPFDevelopers.Samples.Shared/Controls/ElementAdorner/ThumbAngle.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Windows.Media;
88
using System.Windows.Shapes;
99

10-
namespace WPFDevelopers.Controls
10+
namespace WPFDevelopers.Samples.Controls
1111
{
1212
public class ThumbAngle : Thumb
1313
{

‎src/WPFDevelopers.Samples.Shared/ExampleViews/ThumbDragAndAngleExample.xaml‎

Lines changed: 62 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,69 @@
1-
<UserControl x:Class="WPFDevelopers.Samples.ExampleViews.ThumbDragAndAngleExample"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
7-
xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
8-
xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
9-
mc:Ignorable="d"
10-
d:DesignHeight="450" d:DesignWidth="800">
1+
<UserControl
2+
x:Class="WPFDevelopers.Samples.ExampleViews.ThumbDragAndAngleExample"
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+
d:DesignHeight="450"
10+
d:DesignWidth="800"
11+
mc:Ignorable="d">
1112
<controls:CodeViewer>
12-
<Canvas x:Name="_CanvasMain" Background="ForestGreen">
13+
<Canvas x:Name="_CanvasMain" Background="ForestGreen">
1314

14-
<TextBlock Text="QQ群：340500857" Foreground="White" FontSize="20"
15-
Canvas.Left="296"
16-
Canvas.Top="48" />
17-
<TextBlock Text="QQ群：458041663" Foreground="White" FontSize="20"
18-
Canvas.Left="292"
19-
Canvas.Top="110" />
20-
<Border BorderThickness="2" BorderBrush="White"
21-
x:Name="_border" Width="280"
22-
Height="100"
23-
Canvas.Left="305"
24-
Canvas.Top="205"
25-
RenderTransformOrigin="0.5,0.5">
26-
<Grid>
27-
<wpfdev:ThumbAngle DataContext="{Binding ElementName=_border}"/>
28-
<TextBlock Text="WPF开发者" Foreground="White" FontSize="40"
29-
HorizontalAlignment="Center" VerticalAlignment="Center"/>
15+
<TextBlock
16+
Canvas.Left="296"
17+
Canvas.Top="48"
18+
FontSize="20"
19+
Foreground="White"
20+
Text="QQ群：340500857" />
21+
<TextBlock
22+
Canvas.Left="292"
23+
Canvas.Top="110"
24+
FontSize="20"
25+
Foreground="White"
26+
Text="QQ群：458041663" />
27+
<Border
28+
x:Name="_border"
29+
Canvas.Left="305"
30+
Canvas.Top="205"
31+
Width="280"
32+
Height="100"
33+
BorderBrush="White"
34+
BorderThickness="2"
35+
RenderTransformOrigin="0.5,0.5">
36+
<Grid>
37+
<controls:ThumbAngle DataContext="{Binding ElementName=_border}" />
38+
<TextBlock
39+
HorizontalAlignment="Center"
40+
VerticalAlignment="Center"
41+
FontSize="40"
42+
Foreground="White"
43+
Text="WPF开发者" />
3044

31-
</Grid>
32-
</Border>
33-
<TextBlock Text="微信公众号：WPFDevelopers" Foreground="White" FontSize="24"
34-
HorizontalAlignment="Center" VerticalAlignment="Center"
35-
Canvas.Left="295"
36-
Canvas.Top="368" />
37-
</Canvas>
45+
</Grid>
46+
</Border>
47+
<TextBlock
48+
Canvas.Left="295"
49+
Canvas.Top="368"
50+
HorizontalAlignment="Center"
51+
VerticalAlignment="Center"
52+
FontSize="24"
53+
Foreground="White"
54+
Text="微信公众号：WPFDevelopers" />
55+
</Canvas>
3856
<controls:CodeViewer.SourceCodes>
39-
<controls:SourceCodeModel
40-
CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ThumbDragAndAngleExample.xaml"
41-
CodeType="Xaml"/>
42-
<controls:SourceCodeModel
43-
CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ThumbDragAndAngleExample.xaml.cs"
44-
CodeType="CSharp"/>
57+
<controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ThumbDragAndAngleExample.xaml" CodeType="Xaml" />
58+
<controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ThumbDragAndAngleExample.xaml.cs" CodeType="CSharp" />
59+
<controls:SourceCodeModel
60+
CodeSource="/WPFDevelopers.SamplesCode;component/Controls/ElementAdorner/ElementAdorner.cs"
61+
CodeType="CSharp"
62+
Haader="ElementAdorner" />
63+
<controls:SourceCodeModel
64+
CodeSource="/WPFDevelopers.SamplesCode;component/Controls/ElementAdorner/ThumbAngle.cs"
65+
CodeType="CSharp"
66+
Haader="ThumbAngle" />
4567
</controls:CodeViewer.SourceCodes>
4668
</controls:CodeViewer>
4769
</UserControl>

‎src/WPFDevelopers.Samples.Shared/ExampleViews/ThumbDragAndAngleExample.xaml.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Windows.Controls;
22
using System.Windows.Documents;
3-
using WPFDevelopers.Controls;
3+
using WPFDevelopers.Samples.Controls;
44

55
namespace WPFDevelopers.Samples.ExampleViews
66
{
@@ -12,7 +12,7 @@ public partial class ThumbDragAndAngleExample : UserControl
1212
public ThumbDragAndAngleExample()
1313
{
1414
InitializeComponent();
15-
this.Loaded += (s, e) =>
15+
Loaded += delegate
1616
{
1717
var al = AdornerLayer.GetAdornerLayer(_border);
1818
al.Add(new ElementAdorner(_border));

‎src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
<Compile Include="$(MSBuildThisFileDirectory)Controls\Dashboard\ScaleItem.cs" />
2525
<Compile Include="$(MSBuildThisFileDirectory)Controls\Drawing\DrawingControl.cs" />
2626
<Compile Include="$(MSBuildThisFileDirectory)Controls\Drawing\DrawingPanel.cs" />
27+
<Compile Include="$(MSBuildThisFileDirectory)Controls\ElementAdorner\ElementAdorner.cs" />
28+
<Compile Include="$(MSBuildThisFileDirectory)Controls\ElementAdorner\ThumbAngle.cs" />
2729
<Compile Include="$(MSBuildThisFileDirectory)Controls\Others\FireControl.cs" />
2830
<Compile Include="$(MSBuildThisFileDirectory)Controls\PieControl\PieControl.cs" />
2931
<Compile Include="$(MSBuildThisFileDirectory)Controls\PieControl\PieSegmentModel.cs" />

‎src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@
127127
<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\ScrollViewer\ScrollViewerAnimation.cs" Link="Controls\ScrollViewer\ScrollViewerAnimation.cs" />
128128
<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\ScrollViewer\ScrollViewerBehavior.cs" Link="Controls\ScrollViewer\ScrollViewerBehavior.cs" />
129129
<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\SongWords\SongWords.cs" Link="Controls\SongWords\SongWords.cs" />
130+
<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\ElementAdorner\ElementAdorner.cs" Link="Controls\ElementAdorner\ElementAdorner.cs" />
131+
<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\ElementAdorner\ThumbAngle.cs" Link="Controls\ElementAdorner\ThumbAngle.cs" />
130132
</ItemGroup>
131133
<ItemGroup>
132134
<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\AboutWindow.xaml">

‎src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
<Compile Include="$(MSBuildThisFileDirectory)Controls\DrawerMenu\DrawerMenu.cs" />
3838
<Compile Include="$(MSBuildThisFileDirectory)Controls\DrawerMenu\DrawerMenuItem.cs" />
3939
<Compile Include="$(MSBuildThisFileDirectory)Controls\EdgeLight\EdgeLight.cs" />
40-
<Compile Include="$(MSBuildThisFileDirectory)Controls\ElementAdorner\ElementAdorner.cs" />
41-
<Compile Include="$(MSBuildThisFileDirectory)Controls\ElementAdorner\ThumbAngle.cs" />
4240
<Compile Include="$(MSBuildThisFileDirectory)Controls\Loadings\BallLoading.cs" />
4341
<Compile Include="$(MSBuildThisFileDirectory)Controls\Loadings\CycleLoading.cs" />
4442
<Compile Include="$(MSBuildThisFileDirectory)Controls\Loadings\DefaultLoading.cs" />

0 commit comments

Comments
 (0)