add Dialog

HandyControl/Controls/Other/Dialog.cs

@@ -1,9 +1,69 @@
 using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Input;
+using HandyControl.Interactivity;
+using HandyControl.Tools;
 
 namespace HandyControl.Controls
 {
     public class Dialog : ContentControl
     {
-        
+        private Adorner _container;
+
+        public Dialog()
+        {
+            CommandBindings.Add(new CommandBinding(ControlCommands.Close, (s, e) => Close()));
+        }
+
+        public static Dialog Show(object content)
+        {
+            var dialog = new Dialog
+            {
+                Content = content
+            };
+
+            var window = VisualHelper.GetActiveWindow();
+            if (window != null)
+            {
+                var decorator = VisualHelper.GetChild<AdornerDecorator>(window);
+                if (decorator != null)
+                {
+                    if (decorator.Child != null)
+                    {
+                        decorator.Child.IsEnabled = false;
+                    }
+                    var layer = decorator.AdornerLayer;
+                    if (layer != null)
+                    {
+                        var container = new AdornerContainer(layer)
+                        {
+                            Child = dialog
+                        };
+                        dialog._container = container;
+                        layer.Add(container);
+                    }
+                }
+            }
+
+            return dialog;
+        }
+
+        public void Close()
+        {
+            var window = VisualHelper.GetActiveWindow();
+            if (window != null)
+            {
+                var decorator = VisualHelper.GetChild<AdornerDecorator>(window);
+                if (decorator != null)
+                {
+                    if (decorator.Child != null)
+                    {
+                        decorator.Child.IsEnabled = true;
+                    }
+                    var layer = decorator.AdornerLayer;
+                    layer?.Remove(_container);
+                }
+            }
+        } 
     }
 }

HandyControl/Controls/Other/GotoTop.cs

@@ -30,7 +30,7 @@ namespace HandyControl.Controls
             {
                 _scrollViewer.ScrollChanged -= ScrollViewer_ScrollChanged;
             }
-            _scrollViewer = VisualHelper.GetGetChild<System.Windows.Controls.ScrollViewer>(obj);
+            _scrollViewer = VisualHelper.GetChild<System.Windows.Controls.ScrollViewer>(obj);
             if (_scrollViewer != null)
             {
                 _scrollViewer.ScrollChanged += ScrollViewer_ScrollChanged;

HandyControl/Interactivity/AdornerContainer.cs

@@ -14,8 +14,7 @@ namespace HandyControl.Interactivity
 
         public UIElement Child
         {
-            get =>
-                _child;
+            get => _child;
             set
             {
                 AddVisualChild(value);

HandyControl/Themes/Styles/Base/DialogBaseStyle.xaml

@@ -3,7 +3,17 @@
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <Style x:Key="DialogBaseStyle" TargetType="controls:Dialog">
-        
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:Dialog">
+                    <Border Background="{DynamicResource DarkOpacityBrush}">
+                        <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
     </Style>
 
 </ResourceDictionary>

HandyControl/Tools/Helper/VisualHelper.cs

@@ -27,18 +27,18 @@ namespace HandyControl.Tools
                 : null;
         }
 
-        internal static T GetGetChild<T>(DependencyObject d) where T : DependencyObject
+        internal static T GetChild<T>(DependencyObject d) where T : DependencyObject
         {
-            if (d is T scrollViewer)
+            if (d is T t)
             {
-                return scrollViewer;
+                return t;
             }
 
             for (int i = 0; i < VisualTreeHelper.GetChildrenCount(d); i++)
             {
                 var child = VisualTreeHelper.GetChild(d, i);
 
-                var result = GetGetChild<T>(child);
+                var result = GetChild<T>(child);
                 if (result != null) return result;
             }
 

HandyControlDemo/App.xaml

@@ -31,7 +31,7 @@
 
             <ObjectDataProvider x:Key="DemoTypes" MethodName="GetValues" ObjectType="sys:Enum">
                 <ObjectDataProvider.MethodParameters>
-                    <x:Type Type="data:DemoType"></x:Type>
+                    <x:Type Type="data:DemoType"/>
                 </ObjectDataProvider.MethodParameters>
             </ObjectDataProvider>
 

HandyControlDemo/HandyControlDemo.csproj

@@ -130,6 +130,9 @@
     <Compile Include="UserControl\Basic\ChatBox.xaml.cs">
       <DependentUpon>ChatBox.xaml</DependentUpon>
     </Compile>
+    <Compile Include="UserControl\Basic\TextDialog.xaml.cs">
+      <DependentUpon>TextDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UserControl\Controls\AnimationPathDemoCtl.xaml.cs">
       <DependentUpon>AnimationPathDemoCtl.xaml</DependentUpon>
     </Compile>
@@ -355,6 +358,7 @@
     <Compile Include="ViewModel\Basic\ChatBoxViewModel.cs" />
     <Compile Include="ViewModel\Common\ComboBoxDemoViewModel.cs" />
     <Compile Include="ViewModel\Controls\CoverViewModel.cs" />
+    <Compile Include="ViewModel\Controls\DialogDemoViewModel.cs" />
     <Compile Include="ViewModel\DemoViewModelBase!1.cs" />
     <Compile Include="ViewModel\Main\ContributorsViewModel.cs" />
     <Compile Include="ViewModel\Controls\GrowlDemoViewModel.cs" />
@@ -443,6 +447,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="UserControl\Basic\TextDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="UserControl\Controls\AnimationPathDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

HandyControlDemo/Properties/Langs/Lang.Designer.cs

@@ -798,6 +798,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 请稍后... 的本地化字符串。
+        /// </summary>
+        public static string PleaseWait {
+            get {
+                return ResourceManager.GetString("PleaseWait", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 请输入内容 的本地化字符串。
         /// </summary>
@@ -1113,6 +1122,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 文本对话框 的本地化字符串。
+        /// </summary>
+        public static string TextDialog {
+            get {
+                return ResourceManager.GetString("TextDialog", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 时间条 的本地化字符串。
         /// </summary>

HandyControlDemo/Properties/Langs/Lang.en.resx

@@ -516,4 +516,10 @@
   <data name="Dialog" xml:space="preserve">
     <value>Dialog</value>
   </data>
+  <data name="TextDialog" xml:space="preserve">
+    <value>TextDialog</value>
+  </data>
+  <data name="PleaseWait" xml:space="preserve">
+    <value>Please wait...</value>
+  </data>
 </root>

HandyControlDemo/Properties/Langs/Lang.resx

@@ -516,4 +516,10 @@
   <data name="Dialog" xml:space="preserve">
     <value>对话框</value>
   </data>
+  <data name="TextDialog" xml:space="preserve">
+    <value>文本对话框</value>
+  </data>
+  <data name="PleaseWait" xml:space="preserve">
+    <value>请稍后...</value>
+  </data>
 </root>

HandyControlDemo/UserControl/Basic/TextDialog.xaml

@@ -0,0 +1,15 @@
+<Border x:Class="HandyControlDemo.UserControl.TextDialog"
+        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"
+        xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl"
+        CornerRadius="10"
+        Width="400"
+        Height="247"
+        Background="{DynamicResource RegionBrush}">
+    <Grid>
+        <TextBlock Style="{StaticResource TextBlockLargeBold}" Text="{x:Static langs:Lang.PleaseWait}"/>
+        <Button Width="22" Height="22" Command="interactivity:ControlCommands.Close" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource PrimaryBrush}" controls:IconElement.Geometry="{StaticResource ErrorGeometry}" Padding="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,4,4,0"/>    
+    </Grid>
+</Border>

HandyControlDemo/UserControl/Basic/TextDialog.xaml.cs

@@ -0,0 +1,10 @@
+namespace HandyControlDemo.UserControl
+{
+    public partial class TextDialog
+    {
+        public TextDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}

HandyControlDemo/UserControl/Controls/DialogDemoCtl.xaml

@@ -1,6 +1,8 @@
 <UserControl x:Class="HandyControlDemo.UserControl.DialogDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:userControl="clr-namespace:HandyControlDemo.UserControl">
-    <userControl:UnderConstruction/>
+             xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+             Background="{DynamicResource RegionBrush}"
+             DataContext="{Binding DialogDemo,Source={StaticResource Locator}}">
+    <Button Margin="32" Content="{x:Static langs:Lang.TextDialog}" Command="{Binding ShowTextCmd}"/>
 </UserControl>

HandyControlDemo/ViewModel/Controls/DialogDemoViewModel.cs

@@ -0,0 +1,19 @@
+using System;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.CommandWpf;
+using HandyControl.Controls;
+using HandyControlDemo.UserControl;
+
+namespace HandyControlDemo.ViewModel
+{
+    public class DialogDemoViewModel : ViewModelBase
+    {
+        public RelayCommand ShowTextCmd => new Lazy<RelayCommand>(() =>
+            new RelayCommand(ShowText)).Value;
+
+        private void ShowText()
+        {
+            Dialog.Show(new TextDialog());
+        }
+    }
+}

HandyControlDemo/ViewModel/ViewModelLocator.cs

@@ -24,6 +24,7 @@ namespace HandyControlDemo.ViewModel
             SimpleIoc.Default.Register<PaginationDemoViewModel>();
             SimpleIoc.Default.Register<ChatBoxViewModel>();
             SimpleIoc.Default.Register<CoverViewModel>();
+            SimpleIoc.Default.Register<DialogDemoViewModel>();
         }
 
         public static ViewModelLocator Instance => new Lazy<ViewModelLocator>(() =>
@@ -51,6 +52,8 @@ namespace HandyControlDemo.ViewModel
 
         public CoverViewModel CoverView => ServiceLocator.Current.GetInstance<CoverViewModel>();
 
+        public DialogDemoViewModel DialogDemo => ServiceLocator.Current.GetInstance<DialogDemoViewModel>();
+
         #endregion
     }
 }

README.md

@@ -39,6 +39,10 @@ Step 3：enjoy coding
 
 ## Latest examples
 
+### Dialog
+
+![Dialog](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Dialog.png)
+
 ### WaveProgressBar
 
 ![WaveProgressBar](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/WaveProgressBar.gif)
@@ -55,12 +59,12 @@ Step 3：enjoy coding
 
 ![ChatBubble](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/ChatBubble.png)
 
+## History publication
+
 ### Transfer
 
 ![Transfer](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Transfer.png)
 
-## History publication
-
 ### ProgressButton
 
 ![ProgressButton](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/ProgressButton.png)