Merge branch 'master' into add-NotifyIcon

HandyControlDemo/UserControl/Controls/CarouselDemoCtl.xaml

@@ -7,10 +7,10 @@
         <controls:Carousel Margin="32" IsCenter="True" AutoRun="True" Width="600" Height="330" VerticalAlignment="Center">
             <Image Width="600" Stretch="UniformToFill" Source="/HandyControlDemo;component/Resources/Img/1.jpg"/>
             <Image Width="300" Stretch="UniformToFill" Source="/HandyControlDemo;component/Resources/Img/2.jpg"/>
-            <Grid Width="600">
+            <controls:SimplePanel Width="600">
                 <Image Stretch="UniformToFill" Source="/HandyControlDemo;component/Resources/Img/3.jpg"/>
                 <TextBlock Text="示例文本" Style="{StaticResource TextBlockDefault}" FontSize="100" FontWeight="Bold" Foreground="White"/>
-            </Grid>
+            </controls:SimplePanel>
             <Image Width="600" Stretch="UniformToFill" Source="/HandyControlDemo;component/Resources/Img/4.jpg"/>
             <Image Width="600" Stretch="UniformToFill" Source="/HandyControlDemo;component/Resources/Img/5.jpg"/>
         </controls:Carousel>

HandyControlDemo/UserControl/Controls/GotoTopDemoCtl.xaml

@@ -4,7 +4,7 @@
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
-        <Grid Width="500" Height="400">
+        <controls:SimplePanel Width="500" Height="400">
             <controls:ScrollViewer Name="ScrollViewerDemo" IsEnableInertia="True" Margin="0,10,0,0">
                 <Border Height="2000" Margin="8,0">
                     <Border.Background>
@@ -16,6 +16,6 @@
                 </Border>
             </controls:ScrollViewer>
             <controls:GotoTop Animated="True" AutoHiding="True" AnimationTime="500" Target="{Binding ElementName=ScrollViewerDemo}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,20,20"/>
-        </Grid>
+        </controls:SimplePanel>
     </controls:TransitioningContentControl>
 </UserControl>

HandyControlDemo/UserControl/Controls/GrowlDemoCtl.xaml

@@ -6,14 +6,17 @@
              DataContext="{Binding GrowlDemo,Source={StaticResource Locator}}"
              Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
-        <WrapPanel Margin="32" VerticalAlignment="Center">
-            <Button Command="{Binding InfoCmd}" Content="{x:Static langs:Lang.Info}" Margin="0,5,5,5" Style="{StaticResource ButtonInfo}"/>
-            <Button Command="{Binding SuccessCmd}" Content="{x:Static langs:Lang.Success}" Margin="5" Style="{StaticResource ButtonSuccess}"/>
-            <Button Command="{Binding WarningCmd}" Content="{x:Static langs:Lang.Warning}" Margin="5" Style="{StaticResource ButtonWarning}"/>
-            <Button Command="{Binding ErrorCmd}" Content="{x:Static langs:Lang.Error}" Margin="5" Style="{StaticResource ButtonDanger}"/>
-            <Button Command="{Binding AskCmd}" Content="{x:Static langs:Lang.Ask}" Margin="5" Background="BlueViolet" Foreground="White"/>
-            <Button Command="{Binding FatalCmd}" Content="{x:Static langs:Lang.Fatal}" Margin="5,0"/>
-            <Button Command="{Binding ClearCmd}" Content="{x:Static langs:Lang.Clear}" Margin="5,0,0,0" Style="{StaticResource ButtonPrimary}"/>
-        </WrapPanel>
+        <StackPanel Margin="32">
+            <WrapPanel VerticalAlignment="Center">
+                <Button Command="{Binding InfoCmd}" Content="{x:Static langs:Lang.Info}" Margin="0,5,5,5" Style="{StaticResource ButtonInfo}"/>
+                <Button Command="{Binding SuccessCmd}" Content="{x:Static langs:Lang.Success}" Margin="5" Style="{StaticResource ButtonSuccess}"/>
+                <Button Command="{Binding WarningCmd}" Content="{x:Static langs:Lang.Warning}" Margin="5" Style="{StaticResource ButtonWarning}"/>
+                <Button Command="{Binding ErrorCmd}" Content="{x:Static langs:Lang.Error}" Margin="5" Style="{StaticResource ButtonDanger}"/>
+                <Button Command="{Binding AskCmd}" Content="{x:Static langs:Lang.Ask}" Margin="5" Background="BlueViolet" Foreground="White"/>
+                <Button Command="{Binding FatalCmd}" Content="{x:Static langs:Lang.Fatal}" Margin="5,0"/>
+                <Button Command="{Binding ClearCmd}" Content="{x:Static langs:Lang.Clear}" Margin="5,0,0,0" Style="{StaticResource ButtonPrimary}"/>
+            </WrapPanel>
+            <Button Command="{Binding NewWindowCmd}" Content="{x:Static langs:Lang.NewWindow}" Margin="0,5,0,0" HorizontalAlignment="Left"/>
+        </StackPanel>
     </controls:TransitioningContentControl>
 </UserControl>

HandyControlDemo/UserControl/Controls/SearchBarDemoCtl.xaml

@@ -3,11 +3,12 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+             DataContext="{Binding SearchBarDemo,Source={StaticResource Locator}}"
              Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
         <StackPanel Margin="32" Orientation="Horizontal">
             <StackPanel>
-                <controls:SearchBar/>
+                <controls:SearchBar Command="{Binding SearchCmd}" CommandParameter="{Binding Text,RelativeSource={RelativeSource Self}}"/>
                 <controls:SearchBar Margin="0,32,0,0" IsEnabled="False"/>
 
                 <controls:SearchBar controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" Style="{StaticResource SearchBarExtend}"/>

HandyControlDemo/UserControl/Controls/TabControlDemoCtl.xaml

@@ -9,25 +9,25 @@
                 <Label Style="{StaticResource LabelPrimary}" Content="Default" Margin="32,32,0,0" HorizontalAlignment="Left"/>
                 <controls:TabControl Margin="32,16,32,0" Width="800" Height="300">
                     <controls:TabItem Header="TabItem1">
-                        <Grid Background="White"/>
+                        <controls:SimplePanel Background="White"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem2">
-                        <Grid Background="{DynamicResource DarkDangerBrush}"/>
+                        <controls:SimplePanel Background="{DynamicResource DarkDangerBrush}"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem3" IsSelected="True">
-                        <Grid Background="{DynamicResource PrimaryBrush}"/>
+                        <controls:SimplePanel Background="{DynamicResource PrimaryBrush}"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem4">
-                        <Grid Background="{DynamicResource DarkInfoBrush}"/>
+                        <controls:SimplePanel Background="{DynamicResource DarkInfoBrush}"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem5">
-                        <Grid Background="{DynamicResource DarkSuccessBrush}"/>
+                        <controls:SimplePanel Background="{DynamicResource DarkSuccessBrush}"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem6">
-                        <Grid Background="{DynamicResource DarkWarningBrush}"/>
+                        <controls:SimplePanel Background="{DynamicResource DarkWarningBrush}"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem7">
-                        <Grid Background="{DynamicResource DarkAccentBrush}"/>
+                        <controls:SimplePanel Background="{DynamicResource DarkAccentBrush}"/>
                     </controls:TabItem>
                 </controls:TabControl>
                 <StackPanel Orientation="Horizontal" Margin="32,32,32,16">
@@ -38,25 +38,25 @@
                 </StackPanel>
                 <controls:TabControl IsEnableAnimation="True" ShowCloseButton="True" IsDraggable="True" IsEnableTabFill="True" Margin="32,0,32,32" Width="800" Height="300">
                     <controls:TabItem Header="TabItem1">
-                        <Grid Background="White"/>
+                        <controls:SimplePanel Background="White"/>
                     </controls:TabItem>
                     <controls:TabItem IsSelected="True" Header="TabItem2">
-                        <Grid Background="#FFE8563F"/>
+                        <controls:SimplePanel Background="#FFE8563F"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem3">
-                        <Grid Background="#FF3F4EE8"/>
+                        <controls:SimplePanel Background="#FF3F4EE8"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem4">
-                        <Grid Background="#FFE83F6D"/>
+                        <controls:SimplePanel Background="#FFE83F6D"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem5">
-                        <Grid Background="#FFB23FE8"/>
+                        <controls:SimplePanel Background="#FFB23FE8"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem6">
-                        <Grid Background="#FF3FE8E8"/>
+                        <controls:SimplePanel Background="#FF3FE8E8"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem7">
-                        <Grid Background="#FFE8E03F"/>
+                        <controls:SimplePanel Background="#FFE8E03F"/>
                     </controls:TabItem>
                 </controls:TabControl>
             </StackPanel>