close #397

src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs

@@ -1,38 +1,126 @@
 using System;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Input;
 using System.Windows.Media;
+using System.Windows.Media.Imaging;
 using HandyControl.Data;
+using HandyControl.Interactivity;
+using Microsoft.Win32;
 
 namespace HandyControl.Controls
 {
     public class ImageSelector : Control
     {
-        public static readonly DependencyProperty UriProperty = DependencyProperty.Register(
+        public ImageSelector() => CommandBindings.Add(new CommandBinding(ControlCommands.Switch, SwitchImage));
+
+        private void SwitchImage(object sender, ExecutedRoutedEventArgs e)
+        {
+            if (!HasValue)
+            {
+                var dialog = new OpenFileDialog
+                {
+                    RestoreDirectory = true,
+                    Filter = Filter,
+                    DefaultExt = DefaultExt
+                };
+
+                if (dialog.ShowDialog() == true)
+                {
+                    SetValue(UriPropertyKey, new Uri(dialog.FileName, UriKind.RelativeOrAbsolute));
+                    SetValue(PreviewBrushPropertyKey, new ImageBrush(BitmapFrame.Create(Uri, BitmapCreateOptions.IgnoreImageCache, BitmapCacheOption.None))
+                    {
+                        Stretch = Stretch
+                    });
+                    SetValue(HasValuePropertyKey, ValueBoxes.TrueBox); 
+                    SetCurrentValue(ToolTipProperty, dialog.FileName);
+                }
+            }
+            else
+            {
+                SetValue(UriPropertyKey, default(Uri));
+                SetValue(PreviewBrushPropertyKey, default(Brush));
+                SetValue(HasValuePropertyKey, ValueBoxes.FalseBox);
+                SetCurrentValue(ToolTipProperty, default);
+            }
+        }
+
+        public static readonly DependencyProperty StretchProperty = DependencyProperty.Register(
+            "Stretch", typeof(Stretch), typeof(ImageSelector), new PropertyMetadata(default(Stretch)));
+
+        public Stretch Stretch
+        {
+            get => (Stretch) GetValue(StretchProperty);
+            set => SetValue(StretchProperty, value);
+        }
+
+        public static readonly DependencyPropertyKey UriPropertyKey = DependencyProperty.RegisterReadOnly(
             "Uri", typeof(Uri), typeof(ImageSelector), new PropertyMetadata(default(Uri)));
 
+        public static readonly DependencyProperty UriProperty = UriPropertyKey.DependencyProperty;
+
         public Uri Uri
         {
             get => (Uri) GetValue(UriProperty);
             set => SetValue(UriProperty, value);
         }
 
-        internal static readonly DependencyProperty SourceProperty = DependencyProperty.Register(
-            "Source", typeof(ImageSource), typeof(ImageSelector), new PropertyMetadata(default(ImageSource)));
+        public static readonly DependencyPropertyKey PreviewBrushPropertyKey = DependencyProperty.RegisterReadOnly(
+            "PreviewBrush", typeof(Brush), typeof(ImageSelector), new PropertyMetadata(default(Brush)));
 
-        internal ImageSource Source
+        public static readonly DependencyProperty PreviewBrushProperty = PreviewBrushPropertyKey.DependencyProperty;
+
+        public Brush PreviewBrush
         {
-            get => (ImageSource) GetValue(SourceProperty);
-            set => SetValue(SourceProperty, value);
+            get => (Brush) GetValue(PreviewBrushProperty);
+            set => SetValue(PreviewBrushProperty, value);
         }
 
-        public static readonly DependencyProperty IsPreviewEnabledProperty = DependencyProperty.Register(
-            "IsPreviewEnabled", typeof(bool), typeof(ImageSelector), new PropertyMetadata(ValueBoxes.FalseBox));
+        public static readonly DependencyProperty StrokeThicknessProperty = DependencyProperty.Register(
+            "StrokeThickness", typeof(double), typeof(ImageSelector), new FrameworkPropertyMetadata(ValueBoxes.Double1Box, FrameworkPropertyMetadataOptions.AffectsRender));
 
-        public bool IsPreviewEnabled
+        public double StrokeThickness
         {
-            get => (bool) GetValue(IsPreviewEnabledProperty);
-            set => SetValue(IsPreviewEnabledProperty, value);
+            get => (double) GetValue(StrokeThicknessProperty);
+            set => SetValue(StrokeThicknessProperty, value);
+        }
+
+        public static readonly DependencyProperty StrokeDashArrayProperty = DependencyProperty.Register(
+            "StrokeDashArray", typeof(DoubleCollection), typeof(ImageSelector), new FrameworkPropertyMetadata(default(DoubleCollection), FrameworkPropertyMetadataOptions.AffectsRender));
+
+        public DoubleCollection StrokeDashArray
+        {
+            get => (DoubleCollection) GetValue(StrokeDashArrayProperty);
+            set => SetValue(StrokeDashArrayProperty, value);
+        }
+
+        public static readonly DependencyProperty DefaultExtProperty = DependencyProperty.Register(
+            "DefaultExt", typeof(string), typeof(ImageSelector), new PropertyMetadata(".jpg"));
+
+        public string DefaultExt
+        {
+            get => (string) GetValue(DefaultExtProperty);
+            set => SetValue(DefaultExtProperty, value);
+        }
+
+        public static readonly DependencyProperty FilterProperty = DependencyProperty.Register(
+            "Filter", typeof(string), typeof(ImageSelector), new PropertyMetadata("(.jpg)|*.jpg|(.png)|*.png"));
+
+        public string Filter
+        {
+            get => (string) GetValue(FilterProperty);
+            set => SetValue(FilterProperty, value);
+        }
+
+        public static readonly DependencyPropertyKey HasValuePropertyKey = DependencyProperty.RegisterReadOnly(
+            "HasValue", typeof(bool), typeof(ImageSelector), new PropertyMetadata(ValueBoxes.FalseBox));
+
+        public static readonly DependencyProperty HasValueProperty = HasValuePropertyKey.DependencyProperty;
+
+        public bool HasValue
+        {
+            get => (bool) GetValue(HasValueProperty);
+            set => SetValue(HasValueProperty, value);
         }
     }
 }

src/Shared/HandyControl_Shared/Controls/Panel/SimplePanel.cs

@@ -12,7 +12,7 @@ namespace HandyControl.Controls
     /// </remarks>
     public class SimplePanel : Panel
     {
-        protected override Size MeasureOverride(Size availableSize)
+        protected override Size MeasureOverride(Size constraint)
         {
             var maxSize = new Size();
 
@@ -20,7 +20,7 @@ namespace HandyControl.Controls
             {
                 if (child != null)
                 {
-                    child.Measure(availableSize);
+                    child.Measure(constraint);
                     maxSize.Width = Math.Max(maxSize.Width, child.DesiredSize.Width);
                     maxSize.Height = Math.Max(maxSize.Height, child.DesiredSize.Height);
                 }