add WaterfallPanel

2018-12-28 00:14:09 +08:00
1 parent c2f26ae942
commit 3857ac2d53
@@ -68,6 +68,8 @@
 	
        public static readonly string ShieldDemoCtl = nameof(ShieldDemoCtl);
 	
+        public static readonly string WaterfallPanelDemoCtl = nameof(WaterfallPanelDemoCtl);
+	
        public static readonly string ButtonDemoCtl = nameof(ButtonDemoCtl);

        public static readonly string ToggleButtonDemoCtl = nameof(ToggleButtonDemoCtl);
@@ -36,7 +36,8 @@ var controlList = new List<string>
 	"QQGroupView",
 	"BlurWindow",
 	"RateDemoCtl",
-	"ShieldDemoCtl"
+	"ShieldDemoCtl",
+	"WaterfallPanelDemoCtl"
 };
 var styleList = new List<string>
 {
@@ -196,6 +196,9 @@
    <Compile Include="UserControl\Controls\TimePickerDemoCtl.xaml.cs">
      <DependentUpon>TimePickerDemoCtl.xaml</DependentUpon>
    </Compile>
+    <Compile Include="UserControl\Controls\WaterfallPanelDemoCtl.xaml.cs">
+      <DependentUpon>WaterfallPanelDemoCtl.xaml</DependentUpon>
+    </Compile>
    <Compile Include="UserControl\Controls\WindowDemoCtl.xaml.cs">
      <DependentUpon>WindowDemoCtl.xaml</DependentUpon>
    </Compile>
@@ -491,6 +494,10 @@
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
+    <Page Include="UserControl\Controls\WaterfallPanelDemoCtl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="UserControl\Controls\WindowDemoCtl.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
@@ -671,6 +678,7 @@
      <Generator>TextTemplatingFileGenerator</Generator>
      <LastGenOutput>MessageToken.cs</LastGenOutput>
    </Content>
+    <Resource Include="Resources\Img\LeftMainContent\Panel_16x.png" />
    <Resource Include="Resources\Img\LeftMainContent\Shield_16x.png" />
    <Resource Include="Resources\Img\LeftMainContent\Star.png" />
    <Resource Include="Resources\Img\qq-group.jpg" />
@@ -47,7 +47,7 @@ namespace HandyControlDemo.Properties.Langs {
        }
        
        /// <summary>
-        ///   重写当前线程的 CurrentUICulture 属性
+        ///   使用此强类型资源类，为所有资源查找
        ///   重写当前线程的 CurrentUICulture 属性。
        /// </summary>
        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
@@ -411,6 +411,15 @@ namespace HandyControlDemo.Properties.Langs {
            }
        }
        
+        /// <summary>
+        ///   查找类似 组数 的本地化字符串。
+        /// </summary>
+        public static string Groups {
+            get {
+                return ResourceManager.GetString("Groups", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 信息通知 的本地化字符串。
        /// </summary>
@@ -1050,6 +1059,15 @@ namespace HandyControlDemo.Properties.Langs {
            }
        }
        
+        /// <summary>
+        ///   查找类似 瀑布流 的本地化字符串。
+        /// </summary>
+        public static string WaterfallPanel {
+            get {
+                return ResourceManager.GetString("WaterfallPanel", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 窗口 的本地化字符串。
        /// </summary>
@@ -450,4 +450,10 @@
  <data name="Shield" xml:space="preserve">
    <value>Shield</value>
  </data>
+  <data name="WaterfallPanel" xml:space="preserve">
+    <value>WaterfallPanel</value>
+  </data>
+  <data name="Groups" xml:space="preserve">
+    <value>Groups</value>
+  </data>
 </root>
@@ -430,4 +430,10 @@
  <data name="Shield" xml:space="preserve">
    <value>徽章</value>
  </data>
+  <data name="WaterfallPanel" xml:space="preserve">
+    <value>瀑布流</value>
+  </data>
+  <data name="Groups" xml:space="preserve">
+    <value>组数</value>
+  </data>
 </root>
@@ -0,0 +1,77 @@
+<UserControl x:Class="HandyControlDemo.UserControl.WaterfallPanelDemoCtl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+             xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl"
+             Background="{DynamicResource RegionBrush}">
+    <ContentControl>
+        <Grid Margin="32">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition/>
+            </Grid.RowDefinitions>
+            <controls:NumericUpDown x:Name="UpDownGroups" HorizontalAlignment="Center" Value="2" Minimum="1" Maximum="3" Width="200" Style="{StaticResource NumericUpDownExtend}" controls:TitleElement.Title="{x:Static langs:Lang.Groups}" controls:TitleElement.TitleWidth="50" controls:TitleElement.TitleAlignment="Left"/>
+            <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0,16,0,0">
+                <controls:ScrollViewer MaxHeight="300" IsEnableInertia="True">
+                    <controls:WaterfallPanel VerticalAlignment="Center" Width="300" Groups="{Binding Value,ElementName=UpDownGroups}">
+                        <interactivity:Interaction.Behaviors>
+                            <interactivity:FluidMoveBehavior AppliesTo="Children" Duration="0:0:.2">
+                                <interactivity:FluidMoveBehavior.EaseX>
+                                    <PowerEase/>
+                                </interactivity:FluidMoveBehavior.EaseX>
+                                <interactivity:FluidMoveBehavior.EaseY>
+                                    <PowerEase/>
+                                </interactivity:FluidMoveBehavior.EaseY>
+                            </interactivity:FluidMoveBehavior>
+                        </interactivity:Interaction.Behaviors>
+                        <Border Height="100" Background="{DynamicResource PrimaryBrush}" Effect="{StaticResource EffectShadow1}" Margin="5">
+                            <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                        </Border>
+                        <Border Height="140" Background="{DynamicResource DangerBrush}" Effect="{StaticResource EffectShadow1}" Margin="5">
+                            <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                        </Border>
+                        <Border Height="100" Background="{DynamicResource SuccessBrush}" Effect="{StaticResource EffectShadow1}" Margin="5">
+                            <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                        </Border>
+                        <Border Height="170" Background="{DynamicResource InfoBrush}" Effect="{StaticResource EffectShadow1}" Margin="5">
+                            <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                        </Border>
+                        <Border Height="100" Background="{DynamicResource WarningBrush}" Effect="{StaticResource EffectShadow1}" Margin="5">
+                            <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                        </Border>
+                    </controls:WaterfallPanel>
+                </controls:ScrollViewer>
+                <controls:ScrollViewer Margin="32,0,0,0" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Hidden" Orientation="Horizontal" IsEnableInertia="True" MaxWidth="300">
+                    <controls:WaterfallPanel VerticalAlignment="Center" Height="300" Orientation="Vertical" Groups="{Binding Value,ElementName=UpDownGroups}">
+                        <interactivity:Interaction.Behaviors>
+                            <interactivity:FluidMoveBehavior AppliesTo="Children" Duration="0:0:.2">
+                                <interactivity:FluidMoveBehavior.EaseX>
+                                    <PowerEase/>
+                                </interactivity:FluidMoveBehavior.EaseX>
+                                <interactivity:FluidMoveBehavior.EaseY>
+                                    <PowerEase/>
+                                </interactivity:FluidMoveBehavior.EaseY>
+                            </interactivity:FluidMoveBehavior>
+                        </interactivity:Interaction.Behaviors>
+                        <Border Width="100" Background="{DynamicResource PrimaryBrush}" Effect="{StaticResource EffectShadow1}" Margin="5">
+                            <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                        </Border>
+                        <Border Width="140" Background="{DynamicResource DangerBrush}" Effect="{StaticResource EffectShadow1}" Margin="5">
+                            <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                        </Border>
+                        <Border Width="100" Background="{DynamicResource SuccessBrush}" Effect="{StaticResource EffectShadow1}" Margin="5">
+                            <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                        </Border>
+                        <Border Width="170" Background="{DynamicResource InfoBrush}" Effect="{StaticResource EffectShadow1}" Margin="5">
+                            <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                        </Border>
+                        <Border Width="100" Background="{DynamicResource WarningBrush}" Effect="{StaticResource EffectShadow1}" Margin="5">
+                            <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                        </Border>
+                    </controls:WaterfallPanel>
+                </controls:ScrollViewer>
+            </StackPanel>
+        </Grid>
+    </ContentControl>
+</UserControl>
@@ -0,0 +1,10 @@
+namespace HandyControlDemo.UserControl
+{
+    public partial class WaterfallPanelDemoCtl
+    {
+        public WaterfallPanelDemoCtl()
+        {
+            InitializeComponent();
+        }
+    }
+}
@@ -230,6 +230,11 @@
                        <Image Source="../../Resources/Img/LeftMainContent/ColorWheel_16x.png"/>
                    </controls:EdgeElement.LeftContent>
                </ListBoxItem>
+                <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.WaterfallPanelDemoCtl}" Content="{x:Static langs:Lang.WaterfallPanel}">
+                    <controls:EdgeElement.LeftContent>
+                        <Image Source="../../Resources/Img/LeftMainContent/Panel_16x.png"/>
+                    </controls:EdgeElement.LeftContent>
+                </ListBoxItem>
                <ListBoxItem Tag="{x:Static data:MessageToken.CircleProgressBarDemoCtl}" Content="{x:Static langs:Lang.CircleProgressBar}">
                    <controls:EdgeElement.LeftContent>
                        <Image Source="../../Resources/Img/LeftMainContent/ShapeArcRing_16x.png"/>