chfei/HandyControl
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

completed the branch

Browse Source
This commit is contained in:
NaBian committed 2019-11-14 00:01:57 +08:00
1 parent ff7f88c486
commit 8b144a90de
22 files changed
+321 -364
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs
+3 -1
View File
@@ -99,7 +99,7 @@
public static readonly string GridDemoCtl = nameof(GridDemoCtl);
public static readonly string PoptipDemoCtl = nameof(PoptipDemoCtl);
public static readonly string RangeSliderDemoCtl = nameof(RangeSliderDemoCtl);
public static readonly string ButtonGroupDemoCtl = nameof(ButtonGroupDemoCtl);
@@ -124,6 +124,8 @@
public static readonly string DividerDemoCtl = nameof(DividerDemoCtl);
public static readonly string TransitioningContentControlDemoCtl = nameof(TransitioningContentControlDemoCtl);
/*-------------------- Tools --------------------*/
public static readonly string HatchBrushGeneratorDemoCtl = nameof(HatchBrushGeneratorDemoCtl);
src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt
+2 -1
View File
@@ -63,7 +63,8 @@ var controlList = new List<string>
"NotificationDemoCtl",
"FloatingBlockDemoCtl",
"SplitButtonDemoCtl",
"DividerDemoCtl"
"DividerDemoCtl",
"TransitioningContentControlDemoCtl"
};
var styleList = new List<string>
{
src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
+7
View File
@@ -218,6 +218,9 @@
<Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\TransferDemoCtl.xaml.cs">
<DependentUpon>TransferDemoCtl.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\TransitioningContentControlDemoCtl.xaml.cs">
<DependentUpon>TransitioningContentControlDemoCtl.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\WaterfallPanelDemoCtl.xaml.cs">
<DependentUpon>WaterfallPanelDemoCtl.xaml</DependentUpon>
</Compile>
@@ -683,6 +686,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\TransitioningContentControlDemoCtl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\WaterfallPanelDemoCtl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
Generated
+9
View File
@@ -1680,6 +1680,15 @@ namespace HandyControlDemo.Properties.Langs {
}
}
/// <summary>
/// 查找类似 内容过渡控件 的本地化字符串。
/// </summary>
public static string TransitioningContentControl {
get {
return ResourceManager.GetString("TransitioningContentControl", resourceCulture);
}
}
/// <summary>
/// 查找类似 树视图 的本地化字符串。
/// </summary>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
+3
View File
@@ -684,4 +684,7 @@
<data name="PoptipPositionStr" xml:space="preserve">
<value>top-start;top;top-end;right-start;right;right-end;bottom-end;bottom;bottom-start;left-end;left;left-start</value>
</data>
<data name="TransitioningContentControl" xml:space="preserve">
<value>TransitioningContentControl</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
+3
View File
@@ -684,4 +684,7 @@
<data name="PoptipPositionStr" xml:space="preserve">
<value>top-start;top;top-end;right-start;right;right-end;bottom-end;bottom;bottom-start;left-end;left;left-start</value>
</data>
<data name="TransitioningContentControl" xml:space="preserve">
<value>TransitioningContentControl</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx
+3
View File
@@ -684,4 +684,7 @@
<data name="PoptipPositionStr" xml:space="preserve">
<value>top-start;top;top-end;right-start;right;right-end;bottom-end;bottom;bottom-start;left-end;left;left-start</value>
</data>
<data name="TransitioningContentControl" xml:space="preserve">
<value>TransitioningContentControl</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
+3
View File
@@ -684,4 +684,7 @@
<data name="PoptipPositionStr" xml:space="preserve">
<value>上左;上边;上右;右上;右边;右下;下右;下边;下左;左下;左边;左上</value>
</data>
<data name="TransitioningContentControl" xml:space="preserve">
<value>内容过渡控件</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TransitioningContentControl_16x.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 352 B

src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml
+24
View File
@@ -98,4 +98,28 @@
<Setter Property="Padding" Value="25"/>
</Style>
<Storyboard x:Key="Custom1Transition" x:Shared="False">
<DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
<DoubleAnimation.EasingFunction>
<ElasticEase Oscillations="1"/>
</DoubleAnimation.EasingFunction>
</DoubleAnimation>
</Storyboard>
<Storyboard x:Key="Custom2Transition" x:Shared="False">
<DoubleAnimation From="10" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)">
<DoubleAnimation.EasingFunction>
<ElasticEase Oscillations="1"/>
</DoubleAnimation.EasingFunction>
</DoubleAnimation>
</Storyboard>
<Storyboard x:Key="Custom3Transition" x:Shared="False">
<DoubleAnimation From=".8" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)">
<DoubleAnimation.EasingFunction>
<ElasticEase Oscillations="1"/>
</DoubleAnimation.EasingFunction>
</DoubleAnimation>
</Storyboard>
</ResourceDictionary>
src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
+28 -3
View File
@@ -17,13 +17,38 @@
<StackPanel>
<Label Style="{StaticResource LabelPrimary}" Content="Default" Margin="32,32,0,0" HorizontalAlignment="Left"/>
<hc:TabControl ShowOverflowButton="False" ShowScrollButton="True" Margin="32,16,32,0" Width="800" Height="300" IsScrollable="True">
<hc:TabItem Header="TabItem1">
<hc:SimplePanel Background="White"/>
<hc:TabItem Header="TabItem1" IsSelected="True">
<!--<hc:SimplePanel Background="White"/>-->
<hc:TransitioningContentControl>
<StackPanel Margin="32">
<Slider Value="50" Name="SliderDemo" Maximum="100"/>
<StackPanel Orientation="Horizontal" Margin="0,32,0,0">
<hc:CircleProgressBar Value="{Binding Value,ElementName=SliderDemo}"/>
<hc:CircleProgressBar Value="{Binding Value,ElementName=SliderDemo}" FontSize="30" Margin="16,0,0,0"/>
<hc:CircleProgressBar Value="{Binding Value,ElementName=SliderDemo}" Margin="16,0,0,0" ShowText="False" Width="20" Height="20" ArcThickness="2" Style="{StaticResource ProgressBarSuccessCircle}"/>
<hc:CircleProgressBar Value="{Binding Value,ElementName=SliderDemo}" Margin="16,0,0,0" ShowText="False" Width="30" Height="30" ArcThickness="6" Style="{StaticResource ProgressBarInfoCircle}"/>
<hc:CircleProgressBar Value="{Binding Value,ElementName=SliderDemo}" Margin="16,0,0,0" ShowText="False" Width="40" Height="40" ArcThickness="10" Style="{StaticResource ProgressBarWarningCircle}"/>
<hc:CircleProgressBar Value="{Binding Value,ElementName=SliderDemo}" Margin="16,0,0,0" Width="50" Height="50" Style="{StaticResource ProgressBarDangerCircle}"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,32,0,0">
<hc:WaveProgressBar Value="{Binding Value,ElementName=SliderDemo}"/>
<hc:WaveProgressBar Value="{Binding Value,ElementName=SliderDemo}" FontSize="20" Margin="16,0,0,0" WaveThickness="4" WaveStroke="#FFFF0080">
<hc:WaveProgressBar.WaveFill>
<LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
<GradientStop Color="#66FF0080" Offset="0"/>
<GradientStop Color="#FFFF0080" Offset="1"/>
</LinearGradientBrush>
</hc:WaveProgressBar.WaveFill>
</hc:WaveProgressBar>
<hc:WaveProgressBar Value="{Binding Value,ElementName=SliderDemo}" Margin="16,0,0,0" ShowText="False" Width="50" Height="50" Style="{StaticResource ProgressBarWarningWave}"/>
</StackPanel>
</StackPanel>
</hc:TransitioningContentControl>
</hc:TabItem>
<hc:TabItem Header="TabItem2">
<hc:SimplePanel Background="{DynamicResource DarkDangerBrush}"/>
</hc:TabItem>
<hc:TabItem Header="TabItem3" IsSelected="True">
<hc:TabItem Header="TabItem3">
<hc:SimplePanel Background="{DynamicResource PrimaryBrush}"/>
</hc:TabItem>
<hc:TabItem Header="TabItem4">
src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransitioningContentControlDemoCtl.xaml
+53
View File
@@ -0,0 +1,53 @@
<UserControl x:Class="HandyControlDemo.UserControl.TransitioningContentControlDemoCtl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:hc="https://handyorg.github.io/handycontrol"
Background="{DynamicResource RegionBrush}"
Width="720"
Height="500">
<Grid Margin="32">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition/>
</Grid.RowDefinitions>
<ToggleButton Margin="0,0,0,32" IsChecked="True" Name="ButtonVisibilitySwitch" Style="{StaticResource ToggleButtonSwitch}"/>
<UniformGrid Visibility="{Binding IsChecked,ElementName=ButtonVisibilitySwitch,Converter={StaticResource Boolean2VisibilityConverter}}" Grid.Row="1" Rows="4" Columns="3">
<hc:TransitioningContentControl>
<Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Right2Left}" Margin="32"/>
</hc:TransitioningContentControl>
<hc:TransitioningContentControl TransitionMode="Left2Right">
<Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Left2Right}" Margin="32"/>
</hc:TransitioningContentControl>
<hc:TransitioningContentControl TransitionMode="Bottom2Top">
<Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Bottom2Top}" Margin="32"/>
</hc:TransitioningContentControl>
<hc:TransitioningContentControl TransitionMode="Top2Bottom">
<Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Top2Bottom}" Margin="32"/>
</hc:TransitioningContentControl>
<hc:TransitioningContentControl TransitionMode="Right2LeftWithFade">
<Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Right2LeftWithFade}" Margin="32"/>
</hc:TransitioningContentControl>
<hc:TransitioningContentControl TransitionMode="Left2RightWithFade">
<Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Left2RightWithFade}" Margin="32"/>
</hc:TransitioningContentControl>
<hc:TransitioningContentControl TransitionMode="Bottom2TopWithFade">
<Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Bottom2TopWithFade}" Margin="32"/>
</hc:TransitioningContentControl>
<hc:TransitioningContentControl TransitionMode="Top2BottomWithFade">
<Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Top2BottomWithFade}" Margin="32"/>
</hc:TransitioningContentControl>
<hc:TransitioningContentControl TransitionMode="Right2LeftWithFade">
<Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Right2LeftWithFade}" Margin="32"/>
</hc:TransitioningContentControl>
<hc:TransitioningContentControl TransitionStoryboard="{StaticResource Custom1Transition}">
<Label HorizontalAlignment="Stretch" Content="Custom1" Margin="32"/>
</hc:TransitioningContentControl>
<hc:TransitioningContentControl TransitionStoryboard="{StaticResource Custom2Transition}">
<Label HorizontalAlignment="Stretch" Content="Custom2" Margin="32"/>
</hc:TransitioningContentControl>
<hc:TransitioningContentControl TransitionStoryboard="{StaticResource Custom3Transition}">
<Label HorizontalAlignment="Stretch" Content="Custom3" Margin="32"/>
</hc:TransitioningContentControl>
</UniformGrid>
</Grid>
</UserControl>
src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransitioningContentControlDemoCtl.xaml.cs
+10
View File
@@ -0,0 +1,10 @@
namespace HandyControlDemo.UserControl
{
public partial class TransitioningContentControlDemoCtl
{
public TransitioningContentControlDemoCtl()
{
InitializeComponent();
}
}
}
src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
+5
View File
@@ -375,6 +375,11 @@
<Image Source="../../Resources/Img/LeftMainContent/PolygonHexagon_16x.png"/>
</hc:EdgeElement.LeftContent>
</ListBoxItem>
<ListBoxItem Tag="{x:Static data:MessageToken.TransitioningContentControlDemoCtl}" Content="{x:Static langs:Lang.TransitioningContentControl}">
<hc:EdgeElement.LeftContent>
<Image Source="../../Resources/Img/LeftMainContent/TransitioningContentControl_16x.png"/>
</hc:EdgeElement.LeftContent>
</ListBoxItem>
<ListBoxItem Tag="{x:Static data:MessageToken.CoverViewDemoCtl}" Content="{x:Static langs:Lang.CoverView}">
<hc:EdgeElement.LeftContent>
<Image Source="../../Resources/Img/LeftMainContent/DetailDataView_16x.png"/>