update pr/58

HandyControlDemo/UserControl/Basic/InteractiveDialog.xaml

@@ -3,31 +3,14 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
         xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-        xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl"
         CornerRadius="10"
         Width="400"
         Height="247"
-        DataContext="{Binding Path=InteractiveDialog, Source={StaticResource Locator}}"
+        DataContext="{Binding InteractiveDialog, Source={StaticResource Locator}}"
         Background="{DynamicResource RegionBrush}">
-    <controls:SimplePanel>
-        <TextBlock Style="{StaticResource TextBlockLargeBold}"
-                   Text="{Binding Message}"
-                   Margin="30"
-                   VerticalAlignment="Top" />
-
-        <TextBox x:Name="TextBox"
-                 Style="{StaticResource TextBoxBaseStyle}"
-                 Text="{x:Static langs:Lang.PleaseInput}"
-                 Margin="70"
-                 VerticalAlignment="Top" />
-        <Button Width="120"
-                Height="32"
-                Command="{Binding CloseCommand}"
-                CommandParameter="{Binding Path=Text, ElementName=TextBox}"
-                Style="{StaticResource ButtonPrimary}"
-                Content="{x:Static langs:Lang.Ok}"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Bottom"
-                Margin="0 0 0 30" />
-    </controls:SimplePanel>
+    <StackPanel VerticalAlignment="Center" Margin="32">
+        <TextBlock Style="{StaticResource TextBlockLargeBold}" Text="{Binding Message}"/>
+        <TextBox Margin="0,32,0,0" Style="{StaticResource TextBoxExtend}" Text="{Binding Result,UpdateSourceTrigger=PropertyChanged}" controls:InfoElement.Placeholder="{x:Static langs:Lang.PleaseInput}"/>
+        <Button Width="120" Margin="0,32,0,0" Command="{Binding CloseCmd}" Style="{StaticResource ButtonPrimary}" Content="{x:Static langs:Lang.Ok}"/>
+    </StackPanel>
 </Border>

HandyControlDemo/UserControl/Basic/InteractiveDialog.xaml.cs

@@ -1,8 +1,5 @@
 namespace HandyControlDemo.UserControl.Basic
 {
-    /// <summary>
-    /// Interaction logic for InteractiveDialog.xaml
-    /// </summary>
     public partial class InteractiveDialog
     {
         public InteractiveDialog()

HandyControlDemo/UserControl/Controls/DialogDemoCtl.xaml

@@ -2,20 +2,15 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              Background="{DynamicResource RegionBrush}"
-             DataContext="{Binding DialogDemo,Source={StaticResource Locator}}"
-             Width="300">
-    <StackPanel>
-        <Button Margin="32"
-                Content="{x:Static langs:Lang.TextDialog}"
-                Command="{Binding ShowTextCmd}" />
-        <TextBox x:Name="TextBox"
-                 Style="{StaticResource TextBoxBaseStyle}"
-                 Text="{Binding DialogResult}" 
-                 Margin="20 0"/>
-        <Button Margin="32"
-                Content="{x:Static langs:Lang.InteractiveDialog}"
-                Command="{Binding ShowInteractiveDialogCmd}" 
-                CommandParameter="{Binding Path=Text, ElementName=TextBox}"/>
-    </StackPanel>
+             MinWidth="300"
+             DataContext="{Binding DialogDemo,Source={StaticResource Locator}}">
+    <controls:TransitioningContentControl>
+        <StackPanel Margin="32" VerticalAlignment="Center">
+            <Button Content="{x:Static langs:Lang.TextDialog}" Command="{Binding ShowTextCmd}" />
+            <TextBox Margin="0,32,0,0" Text="{Binding DialogResult,UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource TextBoxExtend}" controls:InfoElement.Placeholder="{x:Static langs:Lang.PleaseInput}"/>
+            <Button Margin="0,10,0,0" Content="{x:Static langs:Lang.InteractiveDialog}" Command="{Binding ShowInteractiveDialogCmd}"/>
+        </StackPanel>
+    </controls:TransitioningContentControl>
 </UserControl>