Ruben 2 роки тому
батько
коміт
fbdd19f857
2 змінених файлів з 0 додано та 275 видалено
  1. 0 11
      src/PicView/PicView.csproj
  2. 0 264
      src/PicView/UILogic/ScrollAnimationBehavior.cs

+ 0 - 11
src/PicView/PicView.csproj

@@ -254,14 +254,6 @@
       <Generator>PublicSettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <None Include="..\.github\README.md">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-    <None Include="..\LICENSE.txt">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <Page Update="Translations\da.xaml">
@@ -334,9 +326,6 @@
   <ItemGroup>
     <Resource Include="Themes\Resources\img\icon__Q6k_icon.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\.editorconfig" Link=".editorconfig" />
-  </ItemGroup>
 	
   <PropertyGroup>
     <FileVersion>1.8.5</FileVersion>

+ 0 - 264
src/PicView/UILogic/ScrollAnimationBehavior.cs

@@ -1,264 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media.Animation;
-
-namespace PicView.UILogic;
-
-internal static class ScrollAnimationBehavior
-{
-    public static double intendedLocation = 0;
-
-    #region VerticalOffset Property
-
-    public static DependencyProperty VerticalOffsetProperty =
-        DependencyProperty.RegisterAttached("VerticalOffset",
-                                            typeof(double),
-                                            typeof(ScrollAnimationBehavior),
-                                            new UIPropertyMetadata(0.0, OnVerticalOffsetChanged));
-
-    public static void SetVerticalOffset(FrameworkElement target, double value)
-    {
-        target.SetValue(VerticalOffsetProperty, value);
-    }
-
-    public static double GetVerticalOffset(FrameworkElement target)
-    {
-        return (double)target.GetValue(VerticalOffsetProperty);
-    }
-
-    #endregion VerticalOffset Property
-
-    #region TimeDuration Property
-
-    public static DependencyProperty TimeDurationProperty =
-        DependencyProperty.RegisterAttached("TimeDuration",
-                                            typeof(TimeSpan),
-                                            typeof(ScrollAnimationBehavior),
-                                            new PropertyMetadata(new TimeSpan(0, 0, 0, 0, 0)));
-
-    public static void SetTimeDuration(FrameworkElement target, TimeSpan value)
-    {
-        target.SetValue(TimeDurationProperty, value);
-    }
-
-    public static TimeSpan GetTimeDuration(FrameworkElement target)
-    {
-        return (TimeSpan)target.GetValue(TimeDurationProperty);
-    }
-
-    #endregion TimeDuration Property
-
-    #region PointsToScroll Property
-
-    public static DependencyProperty PointsToScrollProperty =
-        DependencyProperty.RegisterAttached("PointsToScroll",
-                                            typeof(double),
-                                            typeof(ScrollAnimationBehavior),
-                                            new PropertyMetadata(0.0));
-
-    public static void SetPointsToScroll(FrameworkElement target, double value)
-    {
-        target.SetValue(PointsToScrollProperty, value);
-    }
-
-    public static double GetPointsToScroll(FrameworkElement target)
-    {
-        return (double)target.GetValue(PointsToScrollProperty);
-    }
-
-    #endregion PointsToScroll Property
-
-    #region OnVerticalOffset Changed
-
-    private static void OnVerticalOffsetChanged(DependencyObject target, DependencyPropertyChangedEventArgs e)
-    {
-        var scrollViewer = target as ScrollViewer;
-        if (scrollViewer != null)
-        {
-            scrollViewer.ScrollToVerticalOffset((double)e.NewValue);
-        }
-    }
-
-    #endregion OnVerticalOffset Changed
-
-    #region IsEnabled Property
-
-    public static DependencyProperty IsEnabledProperty =
-                                            DependencyProperty.RegisterAttached("IsEnabled",
-                                            typeof(bool),
-                                            typeof(ScrollAnimationBehavior),
-                                            new UIPropertyMetadata(false, OnIsEnabledChanged));
-
-    public static void SetIsEnabled(FrameworkElement target, bool value)
-    {
-        target.SetValue(IsEnabledProperty, value);
-    }
-
-    public static bool GetIsEnabled(FrameworkElement target)
-    {
-        return (bool)target.GetValue(IsEnabledProperty);
-    }
-
-    #endregion IsEnabled Property
-
-    #region OnIsEnabledChanged Changed
-
-    private static void OnIsEnabledChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
-    {
-        var target = sender ?? throw new ArgumentNullException(nameof(sender));
-
-        if (target is not ScrollViewer scrollViewer)
-        {
-            return;
-        }
-
-        scrollViewer.Loaded += new RoutedEventHandler(scrollerLoaded);
-    }
-
-    #endregion OnIsEnabledChanged Changed
-
-    #region AnimateScroll Helper
-
-    public static void AnimateScroll(ScrollViewer scrollViewer, double ToValue)
-    {
-        scrollViewer.BeginAnimation(VerticalOffsetProperty, null);
-        var verticalAnimation = new DoubleAnimation();
-        verticalAnimation.From = scrollViewer.VerticalOffset;
-        verticalAnimation.To = ToValue;
-        verticalAnimation.Duration = new Duration(GetTimeDuration(scrollViewer));
-        scrollViewer.BeginAnimation(VerticalOffsetProperty, verticalAnimation);
-    }
-
-    #endregion AnimateScroll Helper
-
-    #region NormalizeScrollPos Helper
-
-    public static double NormalizeScrollPos(ScrollViewer scroll, double scrollChange, Orientation o)
-    {
-        var returnValue = scrollChange;
-
-        if (scrollChange < 0)
-        {
-            returnValue = 0;
-        }
-
-        if (o == Orientation.Vertical && scrollChange > scroll.ScrollableHeight)
-        {
-            returnValue = scroll.ScrollableHeight;
-        }
-        else if (o == Orientation.Horizontal && scrollChange > scroll.ScrollableWidth)
-        {
-            returnValue = scroll.ScrollableWidth;
-        }
-
-        return returnValue;
-    }
-
-    #endregion NormalizeScrollPos Helper
-
-    #region SetEventHandlersForScrollViewer Helper
-
-    public static void SetEventHandlersForScrollViewer(ScrollViewer scroller)
-    {
-        scroller.PreviewMouseWheel += ScrollViewerPreviewMouseWheel;
-        scroller.PreviewKeyDown += ScrollViewerPreviewKeyDown;
-        scroller.PreviewMouseLeftButtonUp += Scroller_PreviewMouseLeftButtonUp;
-    }
-
-    public static void Scroller_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
-    {
-        intendedLocation = ((ScrollViewer)sender).VerticalOffset;
-    }
-
-    #endregion SetEventHandlersForScrollViewer Helper
-
-    #region scrollerLoaded Event Handler
-
-    public static void scrollerLoaded(object sender, RoutedEventArgs e)
-    {
-        var scroller = sender as ScrollViewer;
-
-        SetEventHandlersForScrollViewer(scroller);
-    }
-
-    #endregion scrollerLoaded Event Handler
-
-    #region ScrollViewerPreviewMouseWheel Event Handler
-
-    public static void ScrollViewerPreviewMouseWheel(object sender, MouseWheelEventArgs e)
-    {
-        var mouseWheelChange = (double)e.Delta;
-        var scroller = (ScrollViewer)sender;
-        var newVOffset = intendedLocation - (mouseWheelChange * 2);
-        //We got hit by the mouse again. jump to the offset.
-        scroller.ScrollToVerticalOffset(intendedLocation);
-        if (newVOffset < 0)
-        {
-            newVOffset = 0;
-        }
-        if (newVOffset > scroller.ScrollableHeight)
-        {
-            newVOffset = scroller.ScrollableHeight;
-        }
-
-        AnimateScroll(scroller, newVOffset);
-        intendedLocation = newVOffset;
-        e.Handled = true;
-    }
-
-    #endregion ScrollViewerPreviewMouseWheel Event Handler
-
-    #region ScrollViewerPreviewKeyDown Handler
-
-    public static void ScrollViewerPreviewKeyDown(object sender, KeyEventArgs e)
-    {
-        var scroller = (ScrollViewer)sender;
-
-        var keyPressed = e.Key;
-        var newVerticalPos = GetVerticalOffset(scroller);
-        var isKeyHandled = false;
-
-        switch (keyPressed)
-        {
-            case Key.Down:
-                newVerticalPos = NormalizeScrollPos(scroller, (newVerticalPos + GetPointsToScroll(scroller)), Orientation.Vertical);
-                intendedLocation = newVerticalPos;
-                isKeyHandled = true;
-                break;
-
-            case Key.PageDown:
-                newVerticalPos = NormalizeScrollPos(scroller, (newVerticalPos + scroller.ViewportHeight), Orientation.Vertical);
-                intendedLocation = newVerticalPos;
-                isKeyHandled = true;
-                break;
-
-            case Key.Up:
-                newVerticalPos = NormalizeScrollPos(scroller, (newVerticalPos - GetPointsToScroll(scroller)), Orientation.Vertical);
-                intendedLocation = newVerticalPos;
-                isKeyHandled = true;
-                break;
-
-            case Key.PageUp:
-                newVerticalPos = NormalizeScrollPos(scroller, (newVerticalPos - scroller.ViewportHeight), Orientation.Vertical);
-                intendedLocation = newVerticalPos;
-                isKeyHandled = true;
-                break;
-        }
-
-        if (newVerticalPos != GetVerticalOffset(scroller))
-        {
-            intendedLocation = newVerticalPos;
-            AnimateScroll(scroller, newVerticalPos);
-        }
-
-        e.Handled = isKeyHandled;
-    }
-
-    #endregion ScrollViewerPreviewKeyDown Handler
-}