Modified pr/29

2019-01-11 13:45:57 +08:00
1 parent 004ae9422b
commit 632103b081
@@ -1,22 +0,0 @@
-<controls:BlurWindow x:Class="HandyControlDemo.Window.NoClientDragableWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                     xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-                     mc:Ignorable="d"
-                     WindowStartupLocation="CenterScreen"
-                     ShowTitle="True"
-                     Style="{StaticResource WindowBlur}"
-                     Icon="/HandyControlDemo;component/Resources/Img/icon.ico"
-                    ShowNonClientArea="False"
-                    controls:DragWindows.EnableDrag="{Binding ElementName=dragCheck, Path=IsChecked}"
-                    Title="NoClientDragableWindow" Height="450" Width="800">
-    <StackPanel Background="Transparent" Margin="0,40" VerticalAlignment="Top">
-        <StackPanel Orientation="Horizontal">
-            <Label Content="IsDragable" Margin="5,5"/>
-            <ToggleButton IsChecked="True" Name="dragCheck" VerticalAlignment="Center" Style="{StaticResource ToggleButtonSwitch}"/>
-        </StackPanel>
-        <Button Content="Close Window" Command="SystemCommands.CloseWindowCommand"/>
-    </StackPanel>
-</controls:BlurWindow>
@@ -1,13 +0,0 @@
-namespace HandyControlDemo.Window
-{
-    /// <summary>
-    /// Interaction logic for NoClientDragableWindow.xaml
-    /// </summary>
-    public partial class NoClientDragableWindow
-    {
-        public NoClientDragableWindow()
-        {
-            InitializeComponent();
-        }
-    }
-}
@@ -0,0 +1,24 @@
+<controls:BlurWindow x:Class="HandyControlDemo.Window.NoNonClientAreaDragableWindow"
+                     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                     xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+                     xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+                     mc:Ignorable="d"
+                     WindowStartupLocation="CenterScreen"
+                     ShowTitle="True"
+                     Style="{StaticResource WindowBlur}"
+                     Icon="/HandyControlDemo;component/Resources/Img/icon.ico"
+                     ShowNonClientArea="False"
+                     Title="NoClientDragableWindow" 
+                     Height="450" 
+                     Width="800">
+    <Grid>
+        <Rectangle VerticalAlignment="Top" Margin="10" Height="30" RadiusX="4" RadiusY="4" Stroke="{DynamicResource BorderBrush}" StrokeDashArray="2,2"/>
+        <Border controls:WindowAttach.IsDragElement="True" VerticalAlignment="Top" Margin="11" Height="28" Background="{DynamicResource DarkDefaultBrush}" CornerRadius="4">
+            <TextBlock Text="{x:Static langs:Lang.DragHere}" Style="{StaticResource TextBlockDefault}"/>
+        </Border>
+        <Button Click="ButtonClose_OnClick" HorizontalAlignment="Right" Margin="0,15,15,0" VerticalAlignment="Top" Padding="0" Height="20" Width="20" Style="{StaticResource ButtonPrimary}" controls:IconElement.Geometry="{StaticResource CloseGeometry}" controls:BorderElement.CornerRadius="15"/>
+    </Grid>
+</controls:BlurWindow>
@@ -0,0 +1,14 @@
+using System.Windows;
+
+namespace HandyControlDemo.Window
+{
+    public partial class NoNonClientAreaDragableWindow
+    {
+        public NoNonClientAreaDragableWindow()
+        {
+            InitializeComponent();
+        }
+
+        private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close();
+    }
+}