Merge branch 'master' into pr/28

2019-01-17 15:11:33 +08:00
commit 82ba91395a
@@ -14,8 +14,8 @@
                    <RowDefinition/>
                    <RowDefinition Height="Auto"/>
                </Grid.RowDefinitions>
-                <Image Source="{Binding Source,RelativeSource={RelativeSource FindAncestor,AncestorType=UserControl}}" Height="120" Width="120" Stretch="Uniform" Margin="10"/>
-                <TextBlock TextTrimming="CharacterEllipsis" TextWrapping="NoWrap" Margin="0,0,0,10" Grid.Row="1" Style="{StaticResource TextBlockDefault}" Text="{Binding UserName,RelativeSource={RelativeSource FindAncestor,AncestorType=UserControl}}"></TextBlock>
+                <Image Source="{Binding Source,RelativeSource={RelativeSource AncestorType=UserControl}}" Height="120" Width="120" Stretch="Uniform" Margin="10"/>
+                <TextBlock TextTrimming="CharacterEllipsis" TextWrapping="NoWrap" Margin="0,0,0,10" Grid.Row="1" Style="{StaticResource TextBlockDefault}" Text="{Binding UserName,RelativeSource={RelativeSource AncestorType=UserControl}}"></TextBlock>
            </Grid>
        </Border>
    </Button>
@@ -2,7 +2,7 @@
 using System.Windows;
 using System.Windows.Media.Imaging;

-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class Avatar
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class AnimationPathDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class CarouselDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class CircleProgressBarDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class ClockDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class ColorPickerDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class CompareSliderDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    /// <summary>
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    /// <summary>
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class LoadingDemoCtl
@@ -1,6 +1,6 @@
 using HandyControl.Data;

-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class NumericUpDownDemoCtl
@@ -22,7 +22,7 @@
            <DataGrid IsReadOnly="True" Width="600" Margin="0,16,0,0" Grid.Row="1" HeadersVisibility="All" RowHeaderWidth="60" AutoGenerateColumns="False" ItemsSource="{Binding DataList}">
                <DataGrid.RowHeaderTemplate>
                    <DataTemplate>
-                        <CheckBox IsChecked="{Binding IsSelected,RelativeSource={RelativeSource FindAncestor,AncestorType=DataGridRow}}"/>
+                        <CheckBox IsChecked="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=DataGridRow}}"/>
                    </DataTemplate>
                </DataGrid.RowHeaderTemplate>
                <DataGrid.Columns>
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class PaginationDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class PreviewSliderDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class ScrollViewerDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    /// <summary>
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class TabControlDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class TimeBarDemoCtl
@@ -7,13 +7,14 @@
             DataContext="{Binding WindowDemo,Source={StaticResource Locator}}"
             Background="{DynamicResource RegionBrush}">
    <controls:TransitioningContentControl>
-        <UniformGrid Margin="32" Columns="3" Rows="2" Height="200">
+        <UniformGrid Margin="32" Columns="3" Rows="3" Height="200">
            <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.CommonWindow}" Content="{x:Static langs:Lang.OpenCommonWindow}"/>
            <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.BlurWindow}" Content="{x:Static langs:Lang.OpenBlurWindow}"/>
            <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.CustomNonClientAreaWindow}" Content="{x:Static langs:Lang.OpenCustomNonClientAreaWindow}"/>
            <Button Click="ButtonMessage_OnClick" Content="{x:Static langs:Lang.OpenMessageWindow}"/>
            <Button Click="ButtonCustomContent_OnClick" Content="{x:Static langs:Lang.OpenCustomContentWindow}"/>
            <Button Name="ButtonMouseFollow" Click="ButtonMouseFollow_OnClick" Content="{x:Static langs:Lang.OpenMouseFollowWindow}"/>
+            <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.NoNonClientAreaDragableWindow}" Content="{x:Static langs:Lang.OpenNoNonClientAreaDragableWindow}"/>
        </UniformGrid>
    </controls:TransitioningContentControl>
 </UserControl>
@@ -1,8 +1,9 @@
 using System.Windows;
 using HandyControl.Controls;
 using HandyControl.Tools;
+using MessageBox = HandyControl.Controls.MessageBox;
+

-// ReSharper disable once CheckNamespace
 namespace HandyControlDemo.UserControl
 {
    public partial class WindowDemoCtl
@@ -14,7 +15,7 @@ namespace HandyControlDemo.UserControl

        private void ButtonMessage_OnClick(object sender, RoutedEventArgs e)
        {
-            PopupWindow.ShowDialog(Properties.Langs.Lang.GrowlAsk, showCancel: true);
+            MessageBox.Show(Properties.Langs.Lang.GrowlAsk, Properties.Langs.Lang.Title, MessageBoxButton.YesNo, MessageBoxImage.Question);
        }

        private void ButtonMouseFollow_OnClick(object sender, RoutedEventArgs e)
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class ContributorsView
@@ -4,7 +4,7 @@
        x:Class="HandyControlDemo.UserControl.LeftMainContent"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        xmlns:data="clr-namespace:HandyControlDemo.Data"
-        Background="{Binding Background,RelativeSource={RelativeSource FindAncestor,AncestorType=Window}}"
+        Background="{Binding Background,RelativeSource={RelativeSource AncestorType=Window}}"
        xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
        xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
@@ -352,7 +352,7 @@
                            <Image Source="../../Resources/Img/LeftMainContent/ScrollBox_16x.png"/>
                        </controls:EdgeElement.LeftContent>
                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.WindowDemoCtl}" Content="{x:Static langs:Lang.Window}">
+                    <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.WindowDemoCtl}" Content="{x:Static langs:Lang.Window}">
                        <controls:EdgeElement.LeftContent>
                            <Image Source="../../Resources/Img/LeftMainContent/WindowsForm_16x.png"/>
                        </controls:EdgeElement.LeftContent>
@@ -5,7 +5,7 @@ using System.Windows.Controls;
 using HandyControl.Data;
 using HandyControl.Tools.Extension;

-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    /// <summary>
@@ -3,7 +3,7 @@ using GalaSoft.MvvmLight.Messaging;
 using HandyControl.Tools.Extension;
 using HandyControlDemo.Data;

-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    /// <summary>
@@ -10,7 +10,7 @@ using HandyControlDemo.Data;
 using HandyControlDemo.Tools;
 using HandyControlDemo.Window;

-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class NoUserContent
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class BorderDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class BrushDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    /// <summary>
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class CalendarDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class CheckBoxDemoCtl
@@ -11,7 +11,7 @@
                <DataGrid HeadersVisibility="All" RowHeaderWidth="60" AutoGenerateColumns="False" ItemsSource="{Binding DataList}">
                    <DataGrid.RowHeaderTemplate>
                        <DataTemplate>
-                            <CheckBox IsChecked="{Binding IsSelected,RelativeSource={RelativeSource FindAncestor,AncestorType=DataGridRow}}"/>
+                            <CheckBox IsChecked="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=DataGridRow}}"/>
                        </DataTemplate>
                    </DataGrid.RowHeaderTemplate>
                    <DataGrid.Columns>
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class DataGridDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+

 namespace HandyControlDemo.UserControl
 {
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class ListBoxDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class MenuDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class NaiveScrollViewerDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class NaiveTabControlDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class NaiveTextBoxDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class ProgressBarDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class RadioButtonDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class SliderDemoCtl
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    /// <summary>
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    /// <summary>
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
    public partial class TreeViewDemoCtl