diff --git a/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs b/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs index 0a371d62..ecbb7023 100644 --- a/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs +++ b/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs @@ -110,7 +110,7 @@ namespace HandyControl.Controls } _transform.X = p.X - _previewContent.ActualWidth * 0.5; - _transform.Y = TranslatePoint(new Point(), _adorner).Y - _previewContent.ActualHeight - PreviewContentOffset; + _transform.Y = -_previewContent.ActualHeight - PreviewContentOffset; PreviewPosition = _thumb.IsMouseCaptureWithin ? Value : pos; } @@ -128,7 +128,7 @@ namespace HandyControl.Controls return; } - _transform.X = TranslatePoint(new Point(), _adorner).X - _previewContent.ActualWidth - PreviewContentOffset; + _transform.X = -_previewContent.ActualWidth - PreviewContentOffset; _transform.Y = p.Y - _previewContent.ActualHeight * 0.5; PreviewPosition = _thumb.IsMouseCaptureWithin ? Value : pos; @@ -195,8 +195,17 @@ namespace HandyControl.Controls { _transform = new TranslateTransform(); _previewContent.RenderTransform = _transform; - _previewContent.HorizontalAlignment = HorizontalAlignment.Left; - _previewContent.VerticalAlignment = VerticalAlignment.Top; + + if (Orientation == Orientation.Horizontal) + { + _previewContent.HorizontalAlignment = HorizontalAlignment.Left; + _previewContent.VerticalAlignment = VerticalAlignment.Center; + } + else + { + _previewContent.HorizontalAlignment = HorizontalAlignment.Center; + _previewContent.VerticalAlignment = VerticalAlignment.Top; + } } } } diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/SliderBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SliderBaseStyle.xaml index 79402555..60b63264 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/SliderBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SliderBaseStyle.xaml @@ -624,7 +624,7 @@ - + @@ -641,7 +641,7 @@ - + diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml index f17d4167..016d7983 100644 --- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml @@ -1602,7 +1602,7 @@ - + @@ -1618,7 +1618,7 @@ - +