add some demos & styles

1. add window demo 2. add scrollviewer demo 3. add radiobutton style 4. fixed some bugs 5. add research project
2018-10-23 19:59:59 +08:00
1 parent 0baae519cb
commit fffbdbb4a9
@@ -0,0 +1,9 @@
+using System;
+
+namespace HandyControl.Controls
+{
+    public interface ISingleOpen : IDisposable
+    {
+        bool CanDispose { get; }
+    }
+}
@@ -22,7 +22,7 @@ namespace HandyControl.Controls
    [TemplatePart(Name = ElementSliderColor, Type = typeof(Panel))]
    [TemplatePart(Name = ElementSliderOpacity, Type = typeof(Panel))]
    [TemplatePart(Name = ElementPanelRgb, Type = typeof(Panel))]
-    public class ColorPicker : Control
+    public class ColorPicker : Control, ISingleOpen
    {
        #region Constants

@@ -669,5 +669,9 @@ namespace HandyControl.Controls
            });

        private void ButtonCancel_OnClick(object sender, RoutedEventArgs e) => RaiseEvent(new RoutedEventArgs(CanceledEvent));
+
+        public void Dispose() => Window.GetWindow(this)?.Close();
+
+        public bool CanDispose { get; } = true;
    }
 }
@@ -28,6 +28,10 @@ namespace HandyControl.Controls

        private TextBlock _titleBlock;

+        private bool _showBackground = true;
+
+        private FrameworkElement _targetElement;
+
        public override void OnApplyTemplate()
        {
            if (_titleBlock != null)
@@ -44,6 +48,11 @@ namespace HandyControl.Controls
            {
                _titleBlock.MouseLeftButtonDown += TitleBlock_OnMouseLeftButtonDown;
            }
+
+            if (PopupElement != null)
+            {
+                _mainBorder.Child = PopupElement;
+            }
        }

        internal static readonly DependencyProperty ContentStrProperty = DependencyProperty.Register(
@@ -68,6 +77,16 @@ namespace HandyControl.Controls
                if (!IsDialog)
                    Owner?.Focus();
            };
+            Loaded += (s, e) =>
+            {
+                if (!_showBackground)
+                {
+                    var point = ArithmeticHelper.CalSafePoint(_targetElement, PopupElement, BorderThickness);
+                    Left = point.X;
+                    Top = point.Y;
+                    Opacity = 1;
+                }
+            };
            try
            {
                Owner = Application.Current.MainWindow;
@@ -82,17 +101,7 @@ namespace HandyControl.Controls

        private void CloseButton_OnClick(object sender, RoutedEventArgs e) => Close();

-        public UIElement Child
-        {
-            get => _mainBorder?.Child;
-            set
-            {
-                if (_mainBorder != null)
-                {
-                    _mainBorder.Child = value;
-                }
-            }
-        }
+        public FrameworkElement PopupElement { get; set; }

        public static readonly DependencyProperty ShowTitleProperty = DependencyProperty.Register(
            "ShowTitle", typeof(bool), typeof(PopupWindow), new PropertyMetadata(true));
@@ -129,19 +138,37 @@ namespace HandyControl.Controls
            }
        }

-        public void Show(FrameworkElement element)
+        public void Show(FrameworkElement element, bool showBackground = true)
        {
-            var point = ArithmeticHelper.CalSafePoint(element, Child as FrameworkElement);
-            Left = point.X;
-            Top = point.Y;
+            if (!showBackground)
+            {
+                Opacity = 0;
+                AllowsTransparency = true;
+                WindowStyle = WindowStyle.None;
+                ShowTitle = false;
+                MinWidth = 0;
+                MinHeight = 0;
+            }
+
+            _showBackground = showBackground;
+            _targetElement = element;
            Show();
        }

-        public void ShowDialog(FrameworkElement element)
+        public void ShowDialog(FrameworkElement element, bool showBackground = true)
        {
-            var point = ArithmeticHelper.CalSafePoint(element, Child as FrameworkElement);
-            Left = point.X;
-            Top = point.Y;
+            if (!showBackground)
+            {
+                Opacity = 0;
+                AllowsTransparency = true;
+                WindowStyle = WindowStyle.None;
+                ShowTitle = false;
+                MinWidth = 0;
+                MinHeight = 0;
+            }
+
+            _showBackground = showBackground;
+            _targetElement = element;
            ShowDialog();
        }

@@ -159,7 +186,7 @@ namespace HandyControl.Controls
                AllowsTransparency = true,
                WindowStyle = WindowStyle.None,
                ContentStr = message,
-                WindowStartupLocation = WindowStartupLocation.CenterScreen,
+                WindowStartupLocation = WindowStartupLocation.CenterScreen
            };
            window.Background = window.FindResource("PrimaryBrush") as SolidColorBrush;
            window.Show();
@@ -202,7 +229,7 @@ namespace HandyControl.Controls
        protected override void OnClosed(EventArgs e)
        {
            base.OnClosed(e);
-            Child = null;
+            PopupElement = null;
        }
    }
 }
@@ -16,8 +16,8 @@ namespace HandyControl.Controls
    {
        private Thickness _tempThickness;

-        public static readonly DependencyProperty NoUserContentProperty = DependencyProperty.Register(
-            "NoUserContent", typeof(object), typeof(WindowBorderless), new PropertyMetadata(default(object)));
+        public static readonly DependencyProperty NonClientAreaContentProperty = DependencyProperty.Register(
+            "NonClientAreaContent", typeof(object), typeof(WindowBorderless), new PropertyMetadata(default(object)));

        public static readonly DependencyProperty CloseButtonHoverBrushProperty = DependencyProperty.Register(
            "CloseButtonHoverBrush", typeof(Brush), typeof(WindowBorderless),
@@ -45,20 +45,20 @@ namespace HandyControl.Controls
                "OtherButtonHoverForeground", typeof(Brush), typeof(WindowBorderless),
                new PropertyMetadata(default(Brush)));

-        public static readonly DependencyProperty NoUserAreaBackgroundProperty = DependencyProperty.Register(
-            "NoUserAreaBackground", typeof(Brush), typeof(WindowBorderless),
+        public static readonly DependencyProperty NonClientAreaBackgroundProperty = DependencyProperty.Register(
+            "NonClientAreaBackground", typeof(Brush), typeof(WindowBorderless),
            new PropertyMetadata(default(Brush)));

-        public static readonly DependencyProperty NoUserAreaForegroundProperty = DependencyProperty.Register(
-            "NoUserAreaForeground", typeof(Brush), typeof(WindowBorderless),
+        public static readonly DependencyProperty NonClientAreaForegroundProperty = DependencyProperty.Register(
+            "NonClientAreaForeground", typeof(Brush), typeof(WindowBorderless),
            new PropertyMetadata(default(Brush)));

-        public static readonly DependencyProperty NoUserAreaHeightProperty = DependencyProperty.Register(
-            "NoUserAreaHeight", typeof(double), typeof(WindowBorderless),
+        public static readonly DependencyProperty NonClientAreaHeightProperty = DependencyProperty.Register(
+            "NonClientAreaHeight", typeof(double), typeof(WindowBorderless),
            new PropertyMetadata(28.0));

-        public static readonly DependencyProperty ShowNoUserAreaProperty = DependencyProperty.Register(
-            "ShowNoUserArea", typeof(bool), typeof(WindowBorderless), new PropertyMetadata(true));
+        public static readonly DependencyProperty ShowNonClientAreaProperty = DependencyProperty.Register(
+            "ShowNonClientArea", typeof(bool), typeof(WindowBorderless), new PropertyMetadata(true));

        public static readonly DependencyProperty ShowTitleProperty = DependencyProperty.Register(
            "ShowTitle", typeof(bool), typeof(WindowBorderless), new PropertyMetadata(default(bool)));
@@ -96,7 +96,7 @@ namespace HandyControl.Controls
                GlassFrameThickness = new Thickness(1)
            };
            BindingOperations.SetBinding(chrome, WindowChrome.CaptionHeightProperty,
-                new Binding(NoUserAreaHeightProperty.Name) {Source = this});
+                new Binding(NonClientAreaHeightProperty.Name) {Source = this});
            WindowChrome.SetWindowChrome(this, chrome);

            Loaded += delegate
@@ -169,10 +169,10 @@ namespace HandyControl.Controls
        /// </summary>
        private ResizeMode OriginResizeMode { get; set; }

-        public double NoUserAreaHeight
+        public double NonClientAreaHeight
        {
-            get => (double)GetValue(NoUserAreaHeightProperty);
-            set => SetValue(NoUserAreaHeightProperty, value);
+            get => (double)GetValue(NonClientAreaHeightProperty);
+            set => SetValue(NonClientAreaHeightProperty, value);
        }

        public bool IsFullScreen
@@ -181,10 +181,10 @@ namespace HandyControl.Controls
            set => SetValue(IsFullScreenProperty, value);
        }

-        public object NoUserContent
+        public object NonClientAreaContent
        {
-            get => GetValue(NoUserContentProperty);
-            set => SetValue(NoUserContentProperty, value);
+            get => GetValue(NonClientAreaContentProperty);
+            set => SetValue(NonClientAreaContentProperty, value);
        }

        public Brush CloseButtonHoverBrush
@@ -211,22 +211,22 @@ namespace HandyControl.Controls
            set => SetValue(OtherButtonHoverForegroundProperty, value);
        }

-        public Brush NoUserAreaBackground
+        public Brush NonClientAreaBackground
        {
-            get => (Brush)GetValue(NoUserAreaBackgroundProperty);
-            set => SetValue(NoUserAreaBackgroundProperty, value);
+            get => (Brush)GetValue(NonClientAreaBackgroundProperty);
+            set => SetValue(NonClientAreaBackgroundProperty, value);
        }

-        public Brush NoUserAreaForeground
+        public Brush NonClientAreaForeground
        {
-            get => (Brush)GetValue(NoUserAreaForegroundProperty);
-            set => SetValue(NoUserAreaForegroundProperty, value);
+            get => (Brush)GetValue(NonClientAreaForegroundProperty);
+            set => SetValue(NonClientAreaForegroundProperty, value);
        }

-        public bool ShowNoUserArea
+        public bool ShowNonClientArea
        {
-            get => (bool)GetValue(ShowNoUserAreaProperty);
-            set => SetValue(ShowNoUserAreaProperty, value);
+            get => (bool)GetValue(ShowNonClientAreaProperty);
+            set => SetValue(ShowNonClientAreaProperty, value);
        }

        public bool ShowTitle
@@ -49,6 +49,7 @@
    <Compile Include="Controls\Clock\Clock.cs" />
    <Compile Include="Controls\Clock\ClockRadioButton.cs" />
    <Compile Include="Controls\Growl.cs" />
+    <Compile Include="Controls\ISingleOpen.cs" />
    <Compile Include="Controls\NumericUpDown.cs" />
    <Compile Include="Controls\Pagination.cs" />
    <Compile Include="Controls\Attach\IconElement.cs" />
@@ -58,6 +59,7 @@
    <Compile Include="Controls\Loading\LoadingBase.cs" />
    <Compile Include="Controls\Loading\LoadingCircle.cs" />
    <Compile Include="Controls\Loading\LoadingLine.cs" />
+    <Compile Include="Tools\SingleOpenHelper.cs" />
    <Compile Include="Controls\Steps\StepBar.cs" />
    <Compile Include="Controls\Steps\StepItem.cs" />
    <Compile Include="Controls\TabControl\TabControl.cs" />
@@ -194,6 +196,10 @@
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
+    <Page Include="Themes\Styles\Base\RadioButtonBaseStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="Themes\Styles\Base\TabControlBaseStyle.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
@@ -342,6 +348,10 @@
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
+    <Page Include="Themes\Styles\RadioButton.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="Themes\Styles\ScrollViewer.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
@@ -5,7 +5,7 @@
        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
        <Setter Property="Background" Value="White"/>
        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
        <Setter Property="BorderThickness" Value="1"/>
        <Setter Property="VerticalContentAlignment" Value="Center"/>
        <Setter Property="Padding" Value="6,0,0,0"/>
@@ -15,12 +15,12 @@
                    <ControlTemplate.Resources>
                        <Storyboard x:Key="StoryboardCheckedTrue">
                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Shape.StrokeDashOffset)" Storyboard.TargetName="path">
-                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0"/>
+                                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0"/>
                            </DoubleAnimationUsingKeyFrames>
                        </Storyboard>
                        <Storyboard x:Key="StoryboardCheckedFalse">
                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Shape.StrokeDashOffset)" Storyboard.TargetName="path">
-                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="8"/>
+                                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="8"/>
                            </DoubleAnimationUsingKeyFrames>
                        </Storyboard>
                    </ControlTemplate.Resources>
@@ -0,0 +1,89 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="RadioButtonBaseStyle" TargetType="RadioButton">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Background" Value="White"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="6,0,0,0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RadioButton">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="StoryboardCheckedTrue">
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="optionMark">
+                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0.5"/>
+                            </DoubleAnimationUsingKeyFrames>
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="optionMark">
+                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0.5"/>
+                            </DoubleAnimationUsingKeyFrames>
+                        </Storyboard>
+                        <Storyboard x:Key="StoryboardCheckedFalse">
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="optionMark">
+                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1"/>
+                            </DoubleAnimationUsingKeyFrames>
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="optionMark">
+                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1"/>
+                            </DoubleAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <Grid x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                        <Border Height="18" Width="18" x:Name="radioButtonBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="100" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                            <Ellipse x:Name="optionMark" Fill="White" MinWidth="6" MinHeight="6" RenderTransformOrigin="0.5,0.5">
+                                <Ellipse.RenderTransform>
+                                    <TransformGroup>
+                                        <ScaleTransform/>
+                                    </TransformGroup>
+                                </Ellipse.RenderTransform>
+                            </Ellipse>
+                        </Border>
+                        <ContentPresenter x:Name="contentPresenter" Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="HasContent" Value="true">
+                            <Setter Property="Visibility" TargetName="contentPresenter" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="BorderBrush" Value="{DynamicResource PrimaryTextBrush}"/>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsChecked" Value="true"/>
+                                <Condition Property="IsPressed" Value="true"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Opacity" Value=".8"/>
+                        </MultiTrigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsChecked" Value="false"/>
+                                <Condition Property="IsPressed" Value="true"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
+                        </MultiTrigger>
+                        <Trigger Property="IsChecked" Value="true">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource StoryboardCheckedTrue}"/>
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource StoryboardCheckedFalse}"/>
+                            </Trigger.ExitActions>
+                            <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource DarkPrimaryBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.4"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
@@ -145,8 +145,8 @@
                <RowDefinition Height="Auto"/>
            </Grid.RowDefinitions>
            <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0"/>
-            <ScrollBar x:Name="PART_VerticalScrollBar" Opacity="0.8" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}"/>
-            <ScrollBar x:Name="PART_HorizontalScrollBar" Opacity="0.8" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}"/>
+            <ScrollBar x:Name="PART_VerticalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}"/>
+            <ScrollBar x:Name="PART_HorizontalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}"/>
        </Grid>
        <ControlTemplate.Triggers>
            <EventTrigger RoutedEvent="MouseEnter">
@@ -187,8 +187,8 @@
                <RowDefinition Height="Auto"/>
            </Grid.RowDefinitions>
            <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0"/>
-            <ScrollBar x:Name="PART_VerticalScrollBar" Opacity="0.8" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}"/>
-            <ScrollBar x:Name="PART_HorizontalScrollBar" Opacity="0.8" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}"/>
+            <ScrollBar x:Name="PART_VerticalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}"/>
+            <ScrollBar x:Name="PART_HorizontalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}"/>
        </Grid>
        <ControlTemplate.Triggers>
            <EventTrigger RoutedEvent="MouseEnter">
@@ -1,10 +1,9 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">

    <ResourceDictionary.MergedDictionaries>
        <ResourceDictionary Source="Base/CheckBoxBaseStyle.xaml"/>
    </ResourceDictionary.MergedDictionaries>

-    <Style BasedOn="{StaticResource CheckBoxBaseStyle}" TargetType="CheckBox"></Style>
+    <Style BasedOn="{StaticResource CheckBoxBaseStyle}" TargetType="CheckBox"/>

 </ResourceDictionary>
@@ -239,13 +239,13 @@
                                        <Button Command="{x:Static DataGrid.SelectAllCommand}" Margin="0,0,0,6" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" Style="{StaticResource ButtonIcon}" controls:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}"/>
                                        <DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.ColumnSpan="2" Grid.Row="0" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
                                        <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="1"/>
-                                        <ScrollBar Style="{StaticResource ScrollBarBaseStyle}" x:Name="PART_VerticalScrollBar" Grid.Column="2" Maximum="{TemplateBinding ScrollableHeight}" Orientation="Vertical" Grid.Row="1" Visibility="{TemplateBinding VerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}"/>
+                                        <ScrollBar Style="{StaticResource ScrollBarBaseStyle}" Opacity="0" x:Name="PART_VerticalScrollBar" Grid.Column="2" Maximum="{TemplateBinding ScrollableHeight}" Orientation="Vertical" Grid.Row="1" Visibility="{TemplateBinding VerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}"/>
                                        <Grid Grid.Column="1" Grid.Row="1">
                                            <Grid.ColumnDefinitions>
                                                <ColumnDefinition Width="{Binding NonFrozenColumnsViewportHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
                                                <ColumnDefinition Width="*"/>
                                            </Grid.ColumnDefinitions>
-                                            <ScrollBar Style="{StaticResource ScrollBarBaseStyle}" VerticalAlignment="Bottom" x:Name="PART_HorizontalScrollBar" Grid.Column="1" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" Visibility="{TemplateBinding HorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}"/>
+                                            <ScrollBar Style="{StaticResource ScrollBarBaseStyle}" Opacity="0" VerticalAlignment="Bottom" x:Name="PART_HorizontalScrollBar" Grid.Column="1" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" Visibility="{TemplateBinding HorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}"/>
                                        </Grid>
                                    </Grid>
                                    <ControlTemplate.Triggers>
@@ -0,0 +1,9 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Base/RadioButtonBaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style BasedOn="{StaticResource RadioButtonBaseStyle}" TargetType="RadioButton"/>
+
+</ResourceDictionary>
@@ -21,6 +21,7 @@
        <ResourceDictionary Source="TextBox.xaml"/>
        <ResourceDictionary Source="ComboBox.xaml"/>
        <ResourceDictionary Source="CheckBox.xaml"/>
+        <ResourceDictionary Source="RadioButton.xaml"/>
        <ResourceDictionary Source="NumericUpDown.xaml"/>
        <ResourceDictionary Source="PasswordBox.xaml"/>
        <ResourceDictionary Source="Calendar.xaml"/>
@@ -22,8 +22,8 @@
        <Setter Property="Background" Value="White"/>
        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
        <Setter Property="UseLayoutRounding" Value="True"/>
-        <Setter Property="NoUserAreaBackground" Value="{DynamicResource PrimaryBrush}"/>
-        <Setter Property="NoUserAreaForeground" Value="White"/>
+        <Setter Property="NonClientAreaBackground" Value="{DynamicResource PrimaryBrush}"/>
+        <Setter Property="NonClientAreaForeground" Value="White"/>
        <Setter Property="CloseButtonHoverBrush" Value="Red"/>
        <Setter Property="CloseButtonHoverForeground" Value="White"/>
        <Setter Property="OtherButtonHoverBrush" Value="{DynamicResource DarkPrimaryBrush}"/>
@@ -37,7 +37,7 @@
                                <RowDefinition Height="Auto"/>
                                <RowDefinition/>
                            </Grid.RowDefinitions>
-                            <Grid Visibility="{TemplateBinding IsFullScreen,Converter={StaticResource Boolean2VisibilityReConverter}}" Background="{TemplateBinding NoUserAreaBackground}" Name="GridMenu" TextElement.Foreground="{TemplateBinding NoUserAreaForeground}">
+                            <Grid Visibility="{TemplateBinding IsFullScreen,Converter={StaticResource Boolean2VisibilityReConverter}}" Background="{TemplateBinding NonClientAreaBackground}" Name="GridMenu" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
                                <Grid.ColumnDefinitions>
                                    <ColumnDefinition/>
                                    <ColumnDefinition Width="Auto"/>
@@ -56,11 +56,11 @@
                                    </Grid.ColumnDefinitions>
                                    <ContentPresenter Content="{TemplateBinding Icon}" VerticalAlignment="Center"/>
                                    <TextBlock Name="Title" Grid.Column="1" Text="{TemplateBinding Title}" Padding="10,0,0,0" VerticalAlignment="Center"/>
-                                    <ContentPresenter Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NoUserContent}"/>
+                                    <ContentPresenter WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}"/>
                                </Grid>
                            </Grid>
                            <ContentPresenter Grid.Row="1" Content="{TemplateBinding Content}"/>
-                            <ResizeGrip x:Name="ResizeGrip" HorizontalAlignment="Right" VerticalAlignment="Bottom" Grid.Row="1" IsTabStop="False" Visibility="Collapsed" WindowChrome.ResizeGripDirection="BottomRight" />
+                            <ResizeGrip Width="10" Height="10" x:Name="ResizeGrip" HorizontalAlignment="Right" VerticalAlignment="Bottom" Grid.Row="1" IsTabStop="False" Visibility="Collapsed" WindowChrome.ResizeGripDirection="BottomRight" />
                        </Grid>
                    </Border>
                    <ControlTemplate.Triggers>
@@ -97,7 +97,7 @@
                            <Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBrush,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
                            <Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
                        </Trigger>
-                        <Trigger Property="ShowNoUserArea" Value="False">
+                        <Trigger Property="ShowNonClientArea" Value="False">
                            <Setter Property="Visibility" Value="Collapsed" TargetName="GridMenu"/>
                        </Trigger>
                        <Trigger Property="ShowTitle" Value="False">
@@ -166,12 +166,12 @@
                                    <StackPanel Margin="0,0,0,32" Orientation="Horizontal" Background="White" HorizontalAlignment="Center">
                                        <Button Command="interactivity:ControlCommands.Cancel" Visibility="{TemplateBinding ShowCancel,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="0,0,16,0" Background="Transparent" Style="{StaticResource ButtonCustom}">
                                            <Border BorderThickness="1" BorderBrush="{DynamicResource PrimaryBrush}" MinWidth="80" Height="30" CornerRadius="4" Background="White">
-                                                <TextBlock FontSize="16" Text="{x:Static langs:Lang.Cancel}" Foreground="{DynamicResource PrimaryBrush}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                                <TextBlock Text="{x:Static langs:Lang.Cancel}" Foreground="{DynamicResource PrimaryBrush}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                                            </Border>
                                        </Button>
                                        <Button IsDefault="True" Command="interactivity:ControlCommands.Confirm" Background="Transparent" Style="{StaticResource ButtonCustom}">
                                            <Border MinWidth="80" Height="30" CornerRadius="4" Background="{DynamicResource PrimaryBrush}">
-                                                <TextBlock FontSize="16" Text="{x:Static langs:Lang.Confirm}" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                                <TextBlock Text="{x:Static langs:Lang.Confirm}" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                                            </Border>
                                        </Button>
                                    </StackPanel>
@@ -191,15 +191,6 @@
                </ControlTemplate>
            </Setter.Value>
        </Setter>
-        <Style.Triggers>
-            <EventTrigger RoutedEvent="FrameworkElement.Loaded">
-                <BeginStoryboard>
-                    <Storyboard>
-                        <DoubleAnimation Storyboard.TargetProperty="Opacity" From="0" To="1" Duration="0:0:.2"/>
-                    </Storyboard>
-                </BeginStoryboard>
-            </EventTrigger>
-        </Style.Triggers>
    </Style>

    <Style TargetType="controls:ImageBrowser">
@@ -35,10 +35,7 @@ namespace HandyControl.Tools
        /// <summary>
        ///     计算控件在窗口中的可见坐标
        /// </summary>
-        /// <param name="element"></param>
-        /// <param name="showElement"></param>
-        /// <returns></returns>
-        public static Point CalSafePoint(FrameworkElement element, FrameworkElement showElement)
+        public static Point CalSafePoint(FrameworkElement element, FrameworkElement showElement, Thickness thickness = default(Thickness))
        {
            if (element == null || showElement == null) return default(Point);
            var point = element.PointToScreen(new Point(0, 0));
@@ -46,10 +43,12 @@ namespace HandyControl.Tools
            if (point.X < 0) point.X = 0;
            if (point.Y < 0) point.Y = 0;

-            var maxLeft = SystemParameters.PrimaryScreenWidth -
-                          (double.IsNaN(showElement.Width) ? showElement.ActualWidth : showElement.Width);
-            var maxTop = SystemParameters.PrimaryScreenHeight -
-                         (double.IsNaN(showElement.Height) ? showElement.ActualHeight : showElement.Height);
+            var maxLeft = SystemParameters.WorkArea.Width -
+                          ((double.IsNaN(showElement.Width) ? showElement.ActualWidth : showElement.Width) +
+                           thickness.Left + thickness.Right);
+            var maxTop = SystemParameters.WorkArea.Height -
+                         ((double.IsNaN(showElement.Height) ? showElement.ActualHeight : showElement.Height) +
+                          thickness.Top + thickness.Bottom);
            return new Point(maxLeft > point.X ? point.X : maxLeft, maxTop > point.Y ? point.Y : maxTop);
        }

@@ -0,0 +1,42 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Media;
+using HandyControl.Controls;
+
+namespace HandyControl.Tools
+{
+    /// <summary>
+    ///     该类可以为可视化元素提供单开的功能
+    /// </summary>
+    public class SingleOpenHelper
+    {
+        private static readonly Dictionary<string, ISingleOpen> OpenDic = new Dictionary<string, ISingleOpen>();
+
+        /// <summary>
+        ///     根据指定的类型创建实例
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public static T CreateControl<T>() where T : Visual, ISingleOpen, new()
+        {
+            var typeStr = typeof(T).FullName;
+
+            if (string.IsNullOrEmpty(typeStr)) return default(T);
+
+            var temp = new T();
+            if (!OpenDic.Keys.Contains(typeStr))
+            {
+                OpenDic.Add(typeStr, temp);
+                return temp;
+            }
+            var currentCtl = OpenDic[typeStr];
+            if (currentCtl.CanDispose)
+            {
+                currentCtl.Dispose();
+                OpenDic[typeStr] = temp;
+                return temp;
+            }
+            return default(T);
+        }
+    }
+}