Ruben 2 лет назад
Родитель
Сommit
07deb2d1dd
60 измененных файлов с 249 добавлено и 349 удалено
  1. 0 1
      src/PicView/ChangeImage/Navigation.cs
  2. 2 2
      src/PicView/Editing/Crop/CropFunctions.cs
  3. 0 1
      src/PicView/FileHandling/DeleteFiles.cs
  4. 12 0
      src/PicView/ImageHandling/BatchFunctions.cs
  5. 13 13
      src/PicView/ImageHandling/GetImageData.cs
  6. 6 0
      src/PicView/ImageHandling/ImageSizeFunctions.cs
  7. 8 0
      src/PicView/ImageHandling/SaveImages.cs
  8. 0 1
      src/PicView/PicGallery/GalleryFunctions.cs
  9. 0 1
      src/PicView/PicGallery/GalleryLoad.cs
  10. 30 30
      src/PicView/PicGallery/GalleryToggle.cs
  11. 4 4
      src/PicView/Properties/AssemblyInfo.cs
  12. 1 2
      src/PicView/Themes/Styles/Border.xaml
  13. 1 2
      src/PicView/Themes/Styles/Button.xaml
  14. 1 2
      src/PicView/Themes/Styles/ColorThemes/Dark.xaml
  15. 1 2
      src/PicView/Themes/Styles/ColorThemes/Light.xaml
  16. 5 10
      src/PicView/Themes/Styles/ComboBox.xaml
  17. 1 2
      src/PicView/Themes/Styles/MyWindowStyle.xaml
  18. 2 4
      src/PicView/Themes/Styles/RadioButton.xaml
  19. 1 2
      src/PicView/Themes/Styles/Slider.xaml
  20. 5 10
      src/PicView/Themes/Styles/TextBox.xaml
  21. 1 2
      src/PicView/Themes/Styles/ToggleButton.xaml
  22. 1 2
      src/PicView/Themes/Styles/ToolTip.xaml
  23. 0 1
      src/PicView/UILogic/DragAndDrop/Image_DragAndDrop.cs
  24. 1 1
      src/PicView/UILogic/HideInterfaceLogic.cs
  25. 1 2
      src/PicView/UILogic/Loading/StartLoading.cs
  26. 1 1
      src/PicView/UILogic/Slideshow.cs
  27. 1 3
      src/PicView/Views/Resources/GalleryContextMenu.xaml
  28. 8 16
      src/PicView/Views/Resources/Icons.xaml
  29. 9 20
      src/PicView/Views/Resources/NavigationContextMenu.xaml
  30. 3 6
      src/PicView/Views/Resources/WindowContextMenu.xaml
  31. 1 2
      src/PicView/Views/UserControls/Buttons/GoToPicButton.xaml
  32. 1 1
      src/PicView/Views/UserControls/Buttons/GoToPicButton.xaml.cs
  33. 1 3
      src/PicView/Views/UserControls/Buttons/GripButton.xaml
  34. 1 2
      src/PicView/Views/UserControls/Buttons/LinkButton.xaml
  35. 1 2
      src/PicView/Views/UserControls/Buttons/RestoreButton.xaml
  36. 1 2
      src/PicView/Views/UserControls/Buttons/X2.xaml
  37. 1 3
      src/PicView/Views/UserControls/Gallery/PicGallery.xaml.cs
  38. 2 2
      src/PicView/Views/UserControls/Gallery/PicGalleryItem.xaml.cs
  39. 6 15
      src/PicView/Views/UserControls/Menus/FileMenu.xaml
  40. 6 12
      src/PicView/Views/UserControls/Menus/ImageSettings.xaml
  41. 3 6
      src/PicView/Views/UserControls/Menus/QuickSettingsMenu.xaml
  42. 6 12
      src/PicView/Views/UserControls/Menus/ToolsAndEffectsMenu.xaml
  43. 3 6
      src/PicView/Views/UserControls/Misc/CustomTextBox.xaml
  44. 2 2
      src/PicView/Views/UserControls/Misc/DragDropOverlayPic.xaml.cs
  45. 2 4
      src/PicView/Views/UserControls/Misc/Icon.xaml
  46. 1 3
      src/PicView/Views/UserControls/Misc/LinkChain.xaml
  47. 3 3
      src/PicView/Views/UserControls/Misc/QuickResize.xaml.cs
  48. 0 1
      src/PicView/Views/UserControls/Misc/StartUpUC.xaml
  49. 2 6
      src/PicView/Views/UserControls/Misc/StartUpUC.xaml.cs
  50. 1 3
      src/PicView/Views/UserControls/Misc/ZipIcon.xaml
  51. 0 4
      src/PicView/Views/Windows/AboutWindow.xaml
  52. 74 76
      src/PicView/Views/Windows/ImageInfoWindow.xaml
  53. 4 8
      src/PicView/Views/Windows/MainWindow.xaml
  54. 4 9
      src/PicView/Views/Windows/ResizeWindow.xaml
  55. 1 2
      src/XamlAnimatedGif/AnimationErrorEventArgs.cs
  56. 2 7
      src/XamlAnimatedGif/Animator.cs
  57. 0 2
      src/XamlAnimatedGif/BrushAnimator.cs
  58. 1 2
      src/XamlAnimatedGif/Decoding/InvalidSignatureException.cs
  59. 0 2
      src/XamlAnimatedGif/ImageAnimator.cs
  60. 0 4
      src/XamlAnimatedGif/TimingManager.cs

+ 0 - 1
src/PicView/ChangeImage/Navigation.cs

@@ -2,7 +2,6 @@
 using PicView.FileHandling;
 using PicView.PicGallery;
 using PicView.Properties;
-using PicView.Shortcuts;
 using PicView.UILogic;
 
 namespace PicView.ChangeImage

+ 2 - 2
src/PicView/Editing/Crop/CropFunctions.cs

@@ -3,6 +3,8 @@ using PicView.ChangeImage;
 using PicView.ChangeTitlebar;
 using PicView.FileHandling;
 using PicView.ImageHandling;
+using PicView.PicGallery;
+using PicView.Properties;
 using PicView.UILogic;
 using PicView.UILogic.Loading;
 using PicView.UILogic.TransformImage;
@@ -10,8 +12,6 @@ using System.IO;
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using PicView.PicGallery;
-using PicView.Properties;
 using static PicView.ChangeImage.Navigation;
 using static PicView.UILogic.Sizing.ScaleImage;
 using static PicView.UILogic.TransformImage.Rotation;

+ 0 - 1
src/PicView/FileHandling/DeleteFiles.cs

@@ -1,6 +1,5 @@
 using Microsoft.VisualBasic.FileIO;
 using PicView.ChangeImage;
-using PicView.PicGallery;
 using PicView.UILogic;
 using System.Diagnostics;
 using System.IO;

+ 12 - 0
src/PicView/ImageHandling/BatchFunctions.cs

@@ -55,21 +55,27 @@ namespace PicView.ImageHandling
                                 case ".jpg":
                                     magickImage.Format = MagickFormat.Jpeg;
                                     break;
+
                                 case ".png":
                                     magickImage.Format = MagickFormat.Png;
                                     break;
+
                                 case ".jxl":
                                     magickImage.Format = MagickFormat.Jxl;
                                     break;
+
                                 case ".gif":
                                     magickImage.Format = MagickFormat.Gif;
                                     break;
+
                                 case ".webp":
                                     magickImage.Format = MagickFormat.WebP;
                                     break;
+
                                 case ".heic":
                                     magickImage.Format = MagickFormat.Heic;
                                     break;
+
                                 case ".heif":
                                     magickImage.Format = MagickFormat.Heif;
                                     break;
@@ -104,21 +110,27 @@ namespace PicView.ImageHandling
                                 case ".jpg":
                                     magickImage.Format = MagickFormat.Jpeg;
                                     break;
+
                                 case ".png":
                                     magickImage.Format = MagickFormat.Png;
                                     break;
+
                                 case ".jxl":
                                     magickImage.Format = MagickFormat.Jxl;
                                     break;
+
                                 case ".gif":
                                     magickImage.Format = MagickFormat.Gif;
                                     break;
+
                                 case ".webp":
                                     magickImage.Format = MagickFormat.WebP;
                                     break;
+
                                 case ".heic":
                                     magickImage.Format = MagickFormat.Heic;
                                     break;
+
                                 case ".heif":
                                     magickImage.Format = MagickFormat.Heif;
                                     break;

+ 13 - 13
src/PicView/ImageHandling/GetImageData.cs

@@ -374,23 +374,23 @@ namespace PicView.ImageHandling
                         break;
 
                     case >= 2:
-                    {
-                        var sb = new StringBuilder();
-                        for (var i = 0; i < authorsArray.Length; i++)
                         {
-                            if (i == 0)
-                            {
-                                sb.Append(authorsArray[0]);
-                            }
-                            else
+                            var sb = new StringBuilder();
+                            for (var i = 0; i < authorsArray.Length; i++)
                             {
-                                sb.Append(", " + authorsArray[i]);
+                                if (i == 0)
+                                {
+                                    sb.Append(authorsArray[0]);
+                                }
+                                else
+                                {
+                                    sb.Append(", " + authorsArray[i]);
+                                }
                             }
-                        }
 
-                        authorsValue = sb.ToString();
-                        break;
-                    }
+                            authorsValue = sb.ToString();
+                            break;
+                        }
                 }
             }
 

+ 6 - 0
src/PicView/ImageHandling/ImageSizeFunctions.cs

@@ -115,21 +115,27 @@ namespace PicView.ImageHandling
                             case ".jpg":
                                 magick.Format = MagickFormat.Jpeg;
                                 break;
+
                             case ".png":
                                 magick.Format = MagickFormat.Png;
                                 break;
+
                             case ".jxl":
                                 magick.Format = MagickFormat.Jxl;
                                 break;
+
                             case ".gif":
                                 magick.Format = MagickFormat.Gif;
                                 break;
+
                             case ".webp":
                                 magick.Format = MagickFormat.WebP;
                                 break;
+
                             case ".heic":
                                 magick.Format = MagickFormat.Heic;
                                 break;
+
                             case ".heif":
                                 magick.Format = MagickFormat.Heif;
                                 break;

+ 8 - 0
src/PicView/ImageHandling/SaveImages.cs

@@ -86,21 +86,27 @@ namespace PicView.ImageHandling
                             case ".jpg":
                                 magickImage.Format = MagickFormat.Jpeg;
                                 break;
+
                             case ".png":
                                 magickImage.Format = MagickFormat.Png;
                                 break;
+
                             case ".jxl":
                                 magickImage.Format = MagickFormat.Jxl;
                                 break;
+
                             case ".gif":
                                 magickImage.Format = MagickFormat.Gif;
                                 break;
+
                             case ".webp":
                                 magickImage.Format = MagickFormat.WebP;
                                 break;
+
                             case ".heic":
                                 magickImage.Format = MagickFormat.Heic;
                                 break;
+
                             case ".heif":
                                 magickImage.Format = MagickFormat.Heif;
                                 break;
@@ -175,9 +181,11 @@ namespace PicView.ImageHandling
                         case ".webp":
                             magickImage.Format = MagickFormat.WebP;
                             break;
+
                         case ".jpg":
                             magickImage.Format = MagickFormat.Jpeg;
                             break;
+
                         case ".png":
                             magickImage.Format = MagickFormat.Png;
                             break;

+ 0 - 1
src/PicView/PicGallery/GalleryFunctions.cs

@@ -9,7 +9,6 @@ using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
-using System.Xml.Linq;
 using static PicView.PicGallery.GalleryLoad;
 using static PicView.UILogic.UC;
 

+ 0 - 1
src/PicView/PicGallery/GalleryLoad.cs

@@ -9,7 +9,6 @@ using System.IO;
 using System.Windows;
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
-using static System.Windows.Forms.Design.AxImporter;
 
 namespace PicView.PicGallery
 {

+ 30 - 30
src/PicView/PicGallery/GalleryToggle.cs

@@ -1,13 +1,13 @@
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Threading;
-using PicView.Animations;
+using PicView.Animations;
 using PicView.Properties;
 using PicView.UILogic;
 using PicView.UILogic.Sizing;
 using PicView.Views.UserControls.Gallery;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Threading;
 using static PicView.ChangeImage.Navigation;
 using static PicView.PicGallery.GalleryFunctions;
 using static PicView.UILogic.ConfigureWindows;
@@ -131,34 +131,34 @@ namespace PicView.PicGallery
                     break;
 
                 default:
-                {
-                    if (Pics?.Count < 1)
-                    {
-                        return;
-                    }
-
-                    IsGalleryOpen = true;
-
-                    await GetMainWindow.Dispatcher.BeginInvoke(DispatcherPriority.Render, () =>
                     {
-                        OpenLayout();
-                        GetPicGallery.Visibility = Visibility.Visible;
-
-                        var fade = AnimationHelper.Fade(GetPicGallery, TimeSpan.FromSeconds(.3), TimeSpan.Zero, 0, 1);
-                        if (fade == false)
+                        if (Pics?.Count < 1)
                         {
-                            GetPicGallery.Opacity = 1;
+                            return;
                         }
 
-                        GetClickArrowLeft.Visibility =
-                            GetClickArrowRight.Visibility =
-                                GetX2.Visibility =
-                                    GetMinus.Visibility =
-                                        GetRestoreButton.Visibility =
-                                            GetGalleryShortcut.Visibility = Visibility.Hidden;
-                    });
-                    break;
-                }
+                        IsGalleryOpen = true;
+
+                        await GetMainWindow.Dispatcher.BeginInvoke(DispatcherPriority.Render, () =>
+                        {
+                            OpenLayout();
+                            GetPicGallery.Visibility = Visibility.Visible;
+
+                            var fade = AnimationHelper.Fade(GetPicGallery, TimeSpan.FromSeconds(.3), TimeSpan.Zero, 0, 1);
+                            if (fade == false)
+                            {
+                                GetPicGallery.Opacity = 1;
+                            }
+
+                            GetClickArrowLeft.Visibility =
+                                GetClickArrowRight.Visibility =
+                                    GetX2.Visibility =
+                                        GetMinus.Visibility =
+                                            GetRestoreButton.Visibility =
+                                                GetGalleryShortcut.Visibility = Visibility.Hidden;
+                        });
+                        break;
+                    }
             }
 
             await LoadAndScrollToAsync().ConfigureAwait(false);

+ 4 - 4
src/PicView/Properties/AssemblyInfo.cs

@@ -30,11 +30,11 @@ using System.Windows;
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page,
-    // or application resource dictionaries)
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page,
-    // app, or any theme specific resource dictionaries)
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
 )]
 
 // Version information for an assembly consists of the following four values:

+ 1 - 2
src/PicView/Themes/Styles/Border.xaml

@@ -1,5 +1,4 @@
-<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" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style x:Key="ButtonBorder" TargetType="Border">
         <Setter Property="Height" Value="40" />

+ 1 - 2
src/PicView/Themes/Styles/Button.xaml

@@ -1,5 +1,4 @@
-<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" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style TargetType="Button">
         <Setter Property="FontFamily" Value="/PicView;component/Themes/Resources/fonts/#TeX Gyre Heros" />

+ 1 - 2
src/PicView/Themes/Styles/ColorThemes/Dark.xaml

@@ -1,5 +1,4 @@
-<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" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <!--  Chosen Color  -->
     <Color x:Key="ChosenColor">#FFDB5B3D</Color>

+ 1 - 2
src/PicView/Themes/Styles/ColorThemes/Light.xaml

@@ -1,5 +1,4 @@
-<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" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <!--  Chosen Color  -->
     <Color x:Key="ChosenColor">#FFDB5B3D</Color>

+ 5 - 10
src/PicView/Themes/Styles/ComboBox.xaml

@@ -1,5 +1,4 @@
-<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" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <ControlTemplate x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
         <Grid>
@@ -31,16 +30,13 @@
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="ToggleButton.IsMouseOver" Value="true">
-                <Setter TargetName="Border" Property="BorderBrush"
-                        Value="{DynamicResource ResourceKey=ChosenColorBrush}" />
+                <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource ResourceKey=ChosenColorBrush}" />
             </Trigger>
             <Trigger Property="ToggleButton.IsChecked" Value="true">
-                <Setter TargetName="Border" Property="BorderBrush"
-                        Value="{DynamicResource ResourceKey=ChosenColorBrush}" />
+                <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource ResourceKey=ChosenColorBrush}" />
             </Trigger>
             <Trigger Property="ToggleButton.IsFocused" Value="true">
-                <Setter TargetName="Border" Property="BorderBrush"
-                        Value="{DynamicResource ResourceKey=ChosenColorBrush}" />
+                <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource ResourceKey=ChosenColorBrush}" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
@@ -142,8 +138,7 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsHighlighted" Value="true">
-                            <Setter TargetName="Border" Property="Background"
-                                    Value="{DynamicResource ResourceKey=ChosenColorBrush}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource ResourceKey=ChosenColorBrush}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>

+ 1 - 2
src/PicView/Themes/Styles/MyWindowStyle.xaml

@@ -1,5 +1,4 @@
-<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" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Style x:Key="MyWindowStyle" TargetType="Window">
         <Setter Property="UseLayoutRounding" Value="True" />
         <Setter Property="Template">

+ 2 - 4
src/PicView/Themes/Styles/RadioButton.xaml

@@ -1,5 +1,4 @@
-<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" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style TargetType="{x:Type RadioButton}">
         <Setter Property="Margin" Value="0" />
@@ -263,8 +262,7 @@
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="2">
-                        <StackPanel HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    Orientation="Horizontal">
+                        <StackPanel HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Orientation="Horizontal">
                             <!--  Text element  -->
                             <TextBlock
                                 Width="{TemplateBinding Width}"

+ 1 - 2
src/PicView/Themes/Styles/Slider.xaml

@@ -1,5 +1,4 @@
-<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" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style x:Key="SliderButtonStyle" TargetType="{x:Type RepeatButton}">
         <Setter Property="SnapsToDevicePixels" Value="true" />

+ 5 - 10
src/PicView/Themes/Styles/TextBox.xaml

@@ -1,5 +1,4 @@
-<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" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style TargetType="TextBox">
         <Setter Property="FontFamily" Value="/PicView;component/Themes/Resources/fonts/#Roboto" />
@@ -40,8 +39,7 @@
                                 <Condition Property="IsMouseOver" Value="True" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.Setters>
-                                <Setter TargetName="border" Property="BorderBrush"
-                                        Value="{DynamicResource ResourceKey=ChosenColorBrush}" />
+                                <Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource ResourceKey=ChosenColorBrush}" />
                             </MultiTrigger.Setters>
                         </MultiTrigger>
 
@@ -51,19 +49,16 @@
                                 <Condition Property="IsFocused" Value="True" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.Setters>
-                                <Setter TargetName="border" Property="BorderBrush"
-                                        Value="{DynamicResource ResourceKey=ChosenColorBrush}" />
+                                <Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource ResourceKey=ChosenColorBrush}" />
                             </MultiTrigger.Setters>
                         </MultiTrigger>
 
                         <Trigger Property="IsMouseOver" Value="False">
-                            <Setter TargetName="border" Property="BorderBrush"
-                                    Value="{StaticResource ResourceKey=BorderBrush}" />
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource ResourceKey=BorderBrush}" />
                         </Trigger>
 
                         <Trigger Property="IsReadOnly" Value="True">
-                            <Setter TargetName="border" Property="Background"
-                                    Value="{StaticResource BackgroundColorBrush}" />
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource BackgroundColorBrush}" />
                         </Trigger>
 
                         <Trigger Property="IsReadOnly" Value="False">

+ 1 - 2
src/PicView/Themes/Styles/ToggleButton.xaml

@@ -1,5 +1,4 @@
-<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" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style TargetType="{x:Type ToggleButton}">
         <Setter Property="Margin" Value="0" />

+ 1 - 2
src/PicView/Themes/Styles/ToolTip.xaml

@@ -1,5 +1,4 @@
-<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" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <!--<SnippetToolTip>-->
     <Style x:Key="{x:Type ToolTip}" TargetType="ToolTip">

+ 0 - 1
src/PicView/UILogic/DragAndDrop/Image_DragAndDrop.cs

@@ -1,6 +1,5 @@
 using PicView.ChangeImage;
 using PicView.FileHandling;
-using PicView.ImageHandling;
 using PicView.PicGallery;
 using PicView.ProcessHandling;
 using PicView.Properties;

+ 1 - 1
src/PicView/UILogic/HideInterfaceLogic.cs

@@ -1,8 +1,8 @@
 using PicView.ChangeImage;
+using PicView.PicGallery;
 using PicView.Properties;
 using PicView.UILogic.Sizing;
 using System.Windows;
-using PicView.PicGallery;
 using static PicView.Animations.FadeControls;
 using Timer = System.Timers.Timer;
 

+ 1 - 2
src/PicView/UILogic/Loading/StartLoading.cs

@@ -1,11 +1,10 @@
 using PicView.ChangeImage;
 using PicView.ConfigureSettings;
-using PicView.PicGallery;
 using PicView.Properties;
+using PicView.Shortcuts;
 using PicView.SystemIntegration;
 using System.Windows;
 using System.Windows.Controls;
-using PicView.Shortcuts;
 using static PicView.ChangeImage.Navigation;
 using static PicView.UILogic.Loading.LoadContextMenus;
 using static PicView.UILogic.Loading.LoadControls;

+ 1 - 1
src/PicView/UILogic/Slideshow.cs

@@ -1,10 +1,10 @@
 using PicView.Animations;
 using PicView.ChangeImage;
+using PicView.PicGallery;
 using PicView.Properties;
 using PicView.SystemIntegration;
 using PicView.UILogic.Sizing;
 using System.Windows;
-using PicView.PicGallery;
 using static PicView.ChangeImage.Navigation;
 using Timer = System.Timers.Timer;
 

+ 1 - 3
src/PicView/Views/Resources/GalleryContextMenu.xaml

@@ -1,5 +1,4 @@
-<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" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <ContextMenu x:Key="GalleryCM">
 
@@ -136,6 +135,5 @@
                     Stretch="Fill" />
             </MenuItem.Icon>
         </MenuItem>
-
     </ContextMenu>
 </ResourceDictionary>

+ 8 - 16
src/PicView/Views/Resources/Icons.xaml

@@ -1,5 +1,4 @@
-<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" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <DrawingImage x:Key="BrokenDrawingImage">
         <DrawingImage.Drawing>
@@ -9,24 +8,19 @@
                         <PathGeometry Figures="M0,0L333.45,0 333.45,329.259 0,329.259 0,0z" FillRule="Nonzero" />
                     </DrawingGroup.ClipGeometry>
                     <DrawingGroup Opacity="1" Transform="1,0,0,1,-0.2751007,0.37069702">
-                        <GeometryDrawing Brush="#FF333333"
-                                         Geometry="F0 M333.4497,329.25934z M0,0z M0.724854,163.63C0.724854,73.6073 75.2694,0.629669 167.225,0.629669 259.18,0.629669 333.725,73.6073 333.725,163.63 333.725,253.652 259.18,326.63 167.225,326.63 75.2694,326.63 0.724854,253.652 0.724854,163.63z" />
+                        <GeometryDrawing Brush="#FF333333" Geometry="F0 M333.4497,329.25934z M0,0z M0.724854,163.63C0.724854,73.6073 75.2694,0.629669 167.225,0.629669 259.18,0.629669 333.725,73.6073 333.725,163.63 333.725,253.652 259.18,326.63 167.225,326.63 75.2694,326.63 0.724854,253.652 0.724854,163.63z" />
                         <DrawingGroup Opacity="1">
                             <DrawingGroup.ClipGeometry>
-                                <PathGeometry Figures="M0,0L333.45,0 333.45,329.259 0,329.259 0,0 0,0z"
-                                              FillRule="Nonzero" />
+                                <PathGeometry Figures="M0,0L333.45,0 333.45,329.259 0,329.259 0,0 0,0z" FillRule="Nonzero" />
                             </DrawingGroup.ClipGeometry>
                             <DrawingGroup Opacity="1" Transform="1,0,0,1,0,-0.3703003">
                                 <DrawingGroup Opacity="1" Transform="1,0,0,1,0.2756958,0">
-                                    <GeometryDrawing Brush="#FFEA5B27"
-                                                     Geometry="F1 M333.4497,329.25934z M0,0z M329.796,130.208L311.354,177.826 304.172,196.392 286.112,243.011 280.229,258.204C279.6,259.845,277.133,259.397,277.133,257.644L277.133,214.336C277.133,214.143,277.164,213.949,277.236,213.776L289.486,182.156 296.669,163.58 306.194,138.991C306.514,138.176,306.101,137.259,305.265,136.953L278.155,126.723C277.536,126.488,277.123,125.897,277.123,125.245L277.123,109.094C277.123,107.983,278.248,107.219,279.3,107.617L328.888,126.346C311.406,53.8949 245.461,0 166.74,0 121.569,0 80.6197,17.7714 50.5885,46.5785L255.368,46.5785C257.928,46.5785,260.012,48.6267,260.012,51.164L260.012,263.198C260.012,265.725,257.938,267.783,255.368,267.783L40.6298,267.783C38.0705,267.783,35.9858,265.735,35.9858,263.198L35.9858,62.5258C13.4779,90.5891 0,126.05 0,164.63 0,255.555 74.6445,329.259 166.73,329.259 184.625,329.259 201.849,326.447 218.01,321.291L210.972,318.631 203.531,315.819 120.971,284.648 269.971,284.648 269.207,286.594 264.935,297.63C306.452,267.681 333.449,219.279 333.449,164.62 333.47,152.819 332.18,141.315 329.796,130.208L329.796,130.208 329.796,130.208 329.796,130.208z" />
-                                    <GeometryDrawing Brush="#FFF8AF3C"
-                                                     Geometry="F0 M333.4497,329.25934z M0,0z M62.2502,219.656L73.9737,219.656C80.4857,212.339 86.9666,205.033 93.4579,197.717 95.0265,195.944 96.6261,194.211 98.0709,192.357 98.8862,191.348 99.5054,191.287 100.537,191.99 105.563,195.403 110.63,198.725 115.646,202.19 117.018,203.138 117.689,203.464 118.752,201.629 125.14,190.543 131.725,179.609 138.154,168.543 138.928,167.228 139.403,167.452 140.362,168.135 147.432,173.118 154.532,178.08 161.621,183.053 162.375,183.573 163.149,184.062 163.913,184.582 171.384,169.297 178.784,154.154 186.379,138.625 188.484,142.762 190.425,146.553 192.365,150.343 204.191,173.454 216.018,196.545 227.835,219.656L236.514,219.656C239.083,219.656,241.147,217.597,241.147,215.06L241.147,69.4041C241.147,67.3967 239.847,65.7051 238.031,65.0835 237.556,64.9205 237.05,64.8084 236.524,64.8084L62.2502,64.8084C59.6806,64.8084,57.6166,66.8668,57.6166,69.4041L57.6166,215.06C57.6166,216.15 58.0191,217.149 58.6589,217.933 59.5051,218.973 60.7848,219.656 62.2502,219.656L62.2502,219.656 62.2502,219.656 62.2502,219.656z M105.119,125.969C116.203,126.631 124.583,135.619 124.284,146.654 123.953,159.188 114.16,166.963 103.375,166.739 90.7024,166.474 82.9521,156.773 82.8282,145.992 83.2721,134.039 92.8696,125.245 105.119,125.969L105.119,125.969 105.119,125.969 105.119,125.969z" />
+                                    <GeometryDrawing Brush="#FFEA5B27" Geometry="F1 M333.4497,329.25934z M0,0z M329.796,130.208L311.354,177.826 304.172,196.392 286.112,243.011 280.229,258.204C279.6,259.845,277.133,259.397,277.133,257.644L277.133,214.336C277.133,214.143,277.164,213.949,277.236,213.776L289.486,182.156 296.669,163.58 306.194,138.991C306.514,138.176,306.101,137.259,305.265,136.953L278.155,126.723C277.536,126.488,277.123,125.897,277.123,125.245L277.123,109.094C277.123,107.983,278.248,107.219,279.3,107.617L328.888,126.346C311.406,53.8949 245.461,0 166.74,0 121.569,0 80.6197,17.7714 50.5885,46.5785L255.368,46.5785C257.928,46.5785,260.012,48.6267,260.012,51.164L260.012,263.198C260.012,265.725,257.938,267.783,255.368,267.783L40.6298,267.783C38.0705,267.783,35.9858,265.735,35.9858,263.198L35.9858,62.5258C13.4779,90.5891 0,126.05 0,164.63 0,255.555 74.6445,329.259 166.73,329.259 184.625,329.259 201.849,326.447 218.01,321.291L210.972,318.631 203.531,315.819 120.971,284.648 269.971,284.648 269.207,286.594 264.935,297.63C306.452,267.681 333.449,219.279 333.449,164.62 333.47,152.819 332.18,141.315 329.796,130.208L329.796,130.208 329.796,130.208 329.796,130.208z" />
+                                    <GeometryDrawing Brush="#FFF8AF3C" Geometry="F0 M333.4497,329.25934z M0,0z M62.2502,219.656L73.9737,219.656C80.4857,212.339 86.9666,205.033 93.4579,197.717 95.0265,195.944 96.6261,194.211 98.0709,192.357 98.8862,191.348 99.5054,191.287 100.537,191.99 105.563,195.403 110.63,198.725 115.646,202.19 117.018,203.138 117.689,203.464 118.752,201.629 125.14,190.543 131.725,179.609 138.154,168.543 138.928,167.228 139.403,167.452 140.362,168.135 147.432,173.118 154.532,178.08 161.621,183.053 162.375,183.573 163.149,184.062 163.913,184.582 171.384,169.297 178.784,154.154 186.379,138.625 188.484,142.762 190.425,146.553 192.365,150.343 204.191,173.454 216.018,196.545 227.835,219.656L236.514,219.656C239.083,219.656,241.147,217.597,241.147,215.06L241.147,69.4041C241.147,67.3967 239.847,65.7051 238.031,65.0835 237.556,64.9205 237.05,64.8084 236.524,64.8084L62.2502,64.8084C59.6806,64.8084,57.6166,66.8668,57.6166,69.4041L57.6166,215.06C57.6166,216.15 58.0191,217.149 58.6589,217.933 59.5051,218.973 60.7848,219.656 62.2502,219.656L62.2502,219.656 62.2502,219.656 62.2502,219.656z M105.119,125.969C116.203,126.631 124.583,135.619 124.284,146.654 123.953,159.188 114.16,166.963 103.375,166.739 90.7024,166.474 82.9521,156.773 82.8282,145.992 83.2721,134.039 92.8696,125.245 105.119,125.969L105.119,125.969 105.119,125.969 105.119,125.969z" />
                                 </DrawingGroup>
                                 <DrawingGroup Opacity="1">
                                     <DrawingGroup Opacity="1" Transform="1,0,0,1,12.999954,16.629272">
-                                        <GeometryDrawing
-                                            Geometry="F0 M333.4497,329.25934z M0,0z M36.5,37.5L254.5,275.5">
+                                        <GeometryDrawing Geometry="F0 M333.4497,329.25934z M0,0z M36.5,37.5L254.5,275.5">
                                             <GeometryDrawing.Pen>
                                                 <Pen
                                                     Brush="#FF2E2E2E"
@@ -36,10 +30,8 @@
                                                     Thickness="43" />
                                             </GeometryDrawing.Pen>
                                         </GeometryDrawing>
-                                        <GeometryDrawing Brush="#FF2E2E2E"
-                                                         Geometry="F0 M333.4497,329.25934z M0,0z M0,21.5C0,9.62588 9.84974,0 22,0 34.1503,0 44,9.62588 44,21.5 44,33.3741 34.1503,43 22,43 9.84974,43 0,33.3741 0,21.5z" />
-                                        <GeometryDrawing Brush="#FF2E2E2E"
-                                                         Geometry="F0 M333.4497,329.25934z M0,0z M245,289.5C245,277.626 254.85,268 267,268 279.15,268 289,277.626 289,289.5 289,301.374 279.15,311 267,311 254.85,311 245,301.374 245,289.5z" />
+                                        <GeometryDrawing Brush="#FF2E2E2E" Geometry="F0 M333.4497,329.25934z M0,0z M0,21.5C0,9.62588 9.84974,0 22,0 34.1503,0 44,9.62588 44,21.5 44,33.3741 34.1503,43 22,43 9.84974,43 0,33.3741 0,21.5z" />
+                                        <GeometryDrawing Brush="#FF2E2E2E" Geometry="F0 M333.4497,329.25934z M0,0z M245,289.5C245,277.626 254.85,268 267,268 279.15,268 289,277.626 289,289.5 289,301.374 279.15,311 267,311 254.85,311 245,301.374 245,289.5z" />
                                     </DrawingGroup>
                                 </DrawingGroup>
                             </DrawingGroup>

+ 9 - 20
src/PicView/Views/Resources/NavigationContextMenu.xaml

@@ -1,5 +1,4 @@
-<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" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <ContextMenu x:Key="navCM">
 
@@ -11,9 +10,7 @@
             StaysOpenOnClick="True">
             <MenuItem.Icon>
                 <Viewbox Width="14" Height="14">
-                    <Path
-                        Data="M310.6 233.4c12.5 12.5 12.5 32.8 0 45.3l-192 192c-12.5 12.5-32.8 12.5-45.3 0s-12.5-32.8 0-45.3L242.7 256 73.4 86.6c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0l192 192z"
-                        Fill="{StaticResource IconColorBrush}" />
+                    <Path Data="M310.6 233.4c12.5 12.5 12.5 32.8 0 45.3l-192 192c-12.5 12.5-32.8 12.5-45.3 0s-12.5-32.8 0-45.3L242.7 256 73.4 86.6c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0l192 192z" Fill="{StaticResource IconColorBrush}" />
                 </Viewbox>
             </MenuItem.Icon>
         </MenuItem>
@@ -26,9 +23,7 @@
             StaysOpenOnClick="True">
             <MenuItem.Icon>
                 <Viewbox Width="14" Height="14">
-                    <Path
-                        Data="M9.4 233.4c-12.5 12.5-12.5 32.8 0 45.3l192 192c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3L77.3 256 246.6 86.6c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0l-192 192z"
-                        Fill="{StaticResource IconColorBrush}" />
+                    <Path Data="M9.4 233.4c-12.5 12.5-12.5 32.8 0 45.3l192 192c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3L77.3 256 246.6 86.6c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0l-192 192z" Fill="{StaticResource IconColorBrush}" />
                 </Viewbox>
             </MenuItem.Icon>
         </MenuItem>
@@ -43,8 +38,7 @@
                         <DrawingImage>
                             <DrawingImage.Drawing>
                                 <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                    <GeometryDrawing
-                                        Geometry="F1 M512,512z M0,0z M400,111L400,401C400,418.44,383,429.52,369,421.16L121.09,272.79C108.97,265.54,108.97,246.46,121.09,239.21L369,90.84C383,82.48,400,93.56,400,111z">
+                                    <GeometryDrawing Geometry="F1 M512,512z M0,0z M400,111L400,401C400,418.44,383,429.52,369,421.16L121.09,272.79C108.97,265.54,108.97,246.46,121.09,239.21L369,90.84C383,82.48,400,93.56,400,111z">
                                         <GeometryDrawing.Pen>
                                             <Pen
                                                 Brush="{StaticResource IconColorBrush}"
@@ -82,8 +76,7 @@
                         <DrawingImage>
                             <DrawingImage.Drawing>
                                 <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                    <GeometryDrawing
-                                        Geometry="F1 M512,512z M0,0z M112,111L112,401C112,418.44,129,429.52,143,421.16L390.9,272.79C403.02,265.54,403.02,246.46,390.9,239.21L143,90.84C129,82.48,112,93.56,112,111z">
+                                    <GeometryDrawing Geometry="F1 M512,512z M0,0z M112,111L112,401C112,418.44,129,429.52,143,421.16L390.9,272.79C403.02,265.54,403.02,246.46,390.9,239.21L143,90.84C129,82.48,112,93.56,112,111z">
                                         <GeometryDrawing.Pen>
                                             <Pen
                                                 Brush="{StaticResource IconColorBrush}"
@@ -123,8 +116,7 @@
                         <DrawingImage>
                             <DrawingImage.Drawing>
                                 <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                    <GeometryDrawing
-                                        Geometry="F1 M512,512z M0,0z M64,192L64,120A40,40,0,0,1,104,80L179.89,80A40,40,0,0,1,202.08,86.72L229.92,105.28A40,40,0,0,0,252.11,112L408,112A40,40,0,0,1,448,152L448,192">
+                                    <GeometryDrawing Geometry="F1 M512,512z M0,0z M64,192L64,120A40,40,0,0,1,104,80L179.89,80A40,40,0,0,1,202.08,86.72L229.92,105.28A40,40,0,0,0,252.11,112L408,112A40,40,0,0,1,448,152L448,192">
                                         <GeometryDrawing.Pen>
                                             <Pen
                                                 Brush="{StaticResource IconColorBrush}"
@@ -135,8 +127,7 @@
                                                 Thickness="32" />
                                         </GeometryDrawing.Pen>
                                     </GeometryDrawing>
-                                    <GeometryDrawing
-                                        Geometry="F1 M512,512z M0,0z M479.9,226.55L463.68,392A40,40,0,0,1,423.75,432L88.25,432A40,40,0,0,1,48.32,392L32.1,226.55A32,32,0,0,1,64,192L448.1,192A32,32,0,0,1,479.9,226.55z">
+                                    <GeometryDrawing Geometry="F1 M512,512z M0,0z M479.9,226.55L463.68,392A40,40,0,0,1,423.75,432L88.25,432A40,40,0,0,1,48.32,392L32.1,226.55A32,32,0,0,1,64,192L448.1,192A32,32,0,0,1,479.9,226.55z">
                                         <GeometryDrawing.Pen>
                                             <Pen
                                                 Brush="{StaticResource IconColorBrush}"
@@ -163,8 +154,7 @@
                         <DrawingImage>
                             <DrawingImage.Drawing>
                                 <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                    <GeometryDrawing
-                                        Geometry="F1 M512,512z M0,0z M64,192L64,120A40,40,0,0,1,104,80L179.89,80A40,40,0,0,1,202.08,86.72L229.92,105.28A40,40,0,0,0,252.11,112L408,112A40,40,0,0,1,448,152L448,192">
+                                    <GeometryDrawing Geometry="F1 M512,512z M0,0z M64,192L64,120A40,40,0,0,1,104,80L179.89,80A40,40,0,0,1,202.08,86.72L229.92,105.28A40,40,0,0,0,252.11,112L408,112A40,40,0,0,1,448,152L448,192">
                                         <GeometryDrawing.Pen>
                                             <Pen
                                                 Brush="{StaticResource IconColorBrush}"
@@ -175,8 +165,7 @@
                                                 Thickness="32" />
                                         </GeometryDrawing.Pen>
                                     </GeometryDrawing>
-                                    <GeometryDrawing
-                                        Geometry="F1 M512,512z M0,0z M479.9,226.55L463.68,392A40,40,0,0,1,423.75,432L88.25,432A40,40,0,0,1,48.32,392L32.1,226.55A32,32,0,0,1,64,192L448.1,192A32,32,0,0,1,479.9,226.55z">
+                                    <GeometryDrawing Geometry="F1 M512,512z M0,0z M479.9,226.55L463.68,392A40,40,0,0,1,423.75,432L88.25,432A40,40,0,0,1,48.32,392L32.1,226.55A32,32,0,0,1,64,192L448.1,192A32,32,0,0,1,479.9,226.55z">
                                         <GeometryDrawing.Pen>
                                             <Pen
                                                 Brush="{StaticResource IconColorBrush}"

+ 3 - 6
src/PicView/Views/Resources/WindowContextMenu.xaml

@@ -1,5 +1,4 @@
-<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" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <ContextMenu x:Key="windowCM">
 
@@ -11,8 +10,7 @@
                         <DrawingImage>
                             <DrawingImage.Drawing>
                                 <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
-                                    <GeometryDrawing Brush="{StaticResource IconColorBrush}"
-                                                     Geometry="F1 M24,24z M0,0z M4,8L8,8 8,4 20,4 20,16 16,16 16,20 4,20 4,8 M16,8L16,14 18,14 18,6 10,6 10,8 16,8 M6,12L6,18 14,18 14,12 6,12z" />
+                                    <GeometryDrawing Brush="{StaticResource IconColorBrush}" Geometry="F1 M24,24z M0,0z M4,8L8,8 8,4 20,4 20,16 16,16 16,20 4,20 4,8 M16,8L16,14 18,14 18,6 10,6 10,8 16,8 M6,12L6,18 14,18 14,12 6,12z" />
                                 </DrawingGroup>
                             </DrawingImage.Drawing>
                         </DrawingImage>
@@ -25,8 +23,7 @@
         <MenuItem Foreground="{StaticResource MainColorBrush}" Header="{StaticResource Minimize}">
             <MenuItem.Icon>
                 <Viewbox Width="14" Height="14">
-                    <Path Data="M24,11c0-0.6-0.4-1-1-1H1c-0.6,0-1,0.4-1,1v2c0,0.6,0.4,1,1,1h22c0.6,0,1-0.4,1-1V11z"
-                          Fill="{StaticResource IconColorBrush}" />
+                    <Path Data="M24,11c0-0.6-0.4-1-1-1H1c-0.6,0-1,0.4-1,1v2c0,0.6,0.4,1,1,1h22c0.6,0,1-0.4,1-1V11z" Fill="{StaticResource IconColorBrush}" />
                 </Viewbox>
             </MenuItem.Icon>
         </MenuItem>

+ 1 - 2
src/PicView/Views/UserControls/Buttons/GoToPicButton.xaml

@@ -21,8 +21,7 @@
                         <DrawingImage>
                             <DrawingImage.Drawing>
                                 <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                    <GeometryDrawing
-                                        Geometry="F1 M512,512z M0,0z M112,111L112,401C112,418.44,129,429.52,143,421.16L390.9,272.79C403.02,265.54,403.02,246.46,390.9,239.21L143,90.84C129,82.48,112,93.56,112,111z">
+                                    <GeometryDrawing Geometry="F1 M512,512z M0,0z M112,111L112,401C112,418.44,129,429.52,143,421.16L390.9,272.79C403.02,265.54,403.02,246.46,390.9,239.21L143,90.84C129,82.48,112,93.56,112,111z">
                                         <GeometryDrawing.Pen>
                                             <Pen
                                                 Brush="{StaticResource PlayIconBrush}"

+ 1 - 1
src/PicView/Views/UserControls/Buttons/GoToPicButton.xaml.cs

@@ -1,11 +1,11 @@
 using PicView.ChangeImage;
 using PicView.ConfigureSettings;
+using PicView.PicGallery;
 using PicView.UILogic;
 using System.Globalization;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
-using PicView.PicGallery;
 using static PicView.Animations.MouseOverAnimations;
 using static PicView.ChangeImage.Navigation;
 using static PicView.UILogic.UC;

+ 1 - 3
src/PicView/Views/UserControls/Buttons/GripButton.xaml

@@ -8,9 +8,7 @@
         Margin="0,0,8,6"
         HorizontalAlignment="Right"
         VerticalAlignment="Bottom">
-        <Path
-            Data="M330.664 296 v-80c0-13.255-10.745-24-24-24H205.333c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24h101.333c13.256 0 24.001-10.745 24.001-24zm32-240v80c0 13.255 10.745 24 24 24H488c13.255 0 24-10.745 24-24V56c0-13.255-10.745-24-24-24H386.667c-13.255 0-24 10.745-24 24zM0 376v80c0 13.255 10.745 24 24 24h101.333c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H24c-13.255 0-24 10.745-24 24zm386.667-56H488c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H386.667c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24zm0 160H488c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H386.667c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24zM181.333 376v80c0 13.255 10.745 24 24 24h101.333c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H205.333c-13.255 0-24 10.745-24 24z"
-            Stretch="Fill">
+        <Path Data="M330.664 296 v-80c0-13.255-10.745-24-24-24H205.333c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24h101.333c13.256 0 24.001-10.745 24.001-24zm32-240v80c0 13.255 10.745 24 24 24H488c13.255 0 24-10.745 24-24V56c0-13.255-10.745-24-24-24H386.667c-13.255 0-24 10.745-24 24zM0 376v80c0 13.255 10.745 24 24 24h101.333c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H24c-13.255 0-24 10.745-24 24zm386.667-56H488c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H386.667c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24zm0 160H488c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H386.667c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24zM181.333 376v80c0 13.255 10.745 24 24 24h101.333c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H205.333c-13.255 0-24 10.745-24 24z" Stretch="Fill">
             <Path.Fill>
                 <SolidColorBrush Opacity=".9" Color="{StaticResource MainColorFaded}" />
             </Path.Fill>

+ 1 - 2
src/PicView/Views/UserControls/Buttons/LinkButton.xaml

@@ -17,8 +17,7 @@
                 <DrawingImage>
                     <DrawingImage.Drawing>
                         <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                            <GeometryDrawing
-                                Geometry="F1 M512,512z M0,0z M432,320L400,320A16,16,0,0,0,384,336L384,448 64,448 64,128 208,128A16,16,0,0,0,224,112L224,80A16,16,0,0,0,208,64L48,64A48,48,0,0,0,0,112L0,464A48,48,0,0,0,48,512L400,512A48,48,0,0,0,448,464L448,336A16,16,0,0,0,432,320z M488,0L360,0C338.63,0,327.95,25.91,343,41L378.73,76.73 135,320.37A24,24,0,0,0,135,354.37L157.67,377A24,24,0,0,0,191.67,377L435.28,133.32 471,169C486,184,512,173.5,512,152L512,24A24,24,0,0,0,488,0z">
+                            <GeometryDrawing Geometry="F1 M512,512z M0,0z M432,320L400,320A16,16,0,0,0,384,336L384,448 64,448 64,128 208,128A16,16,0,0,0,224,112L224,80A16,16,0,0,0,208,64L48,64A48,48,0,0,0,0,112L0,464A48,48,0,0,0,48,512L400,512A48,48,0,0,0,448,464L448,336A16,16,0,0,0,432,320z M488,0L360,0C338.63,0,327.95,25.91,343,41L378.73,76.73 135,320.37A24,24,0,0,0,135,354.37L157.67,377A24,24,0,0,0,191.67,377L435.28,133.32 471,169C486,184,512,173.5,512,152L512,24A24,24,0,0,0,488,0z">
                                 <GeometryDrawing.Brush>
                                     <SolidColorBrush x:Name="IconBrush" Color="{StaticResource IconColor}" />
                                 </GeometryDrawing.Brush>

+ 1 - 2
src/PicView/Views/UserControls/Buttons/RestoreButton.xaml

@@ -22,8 +22,7 @@
                     <DrawingImage>
                         <DrawingImage.Drawing>
                             <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
-                                <GeometryDrawing
-                                    Geometry="F1 M24,24z M0,0z M4,8L8,8 8,4 20,4 20,16 16,16 16,20 4,20 4,8 M16,8L16,14 18,14 18,6 10,6 10,8 16,8 M6,12L6,18 14,18 14,12 6,12z">
+                                <GeometryDrawing Geometry="F1 M24,24z M0,0z M4,8L8,8 8,4 20,4 20,16 16,16 16,20 4,20 4,8 M16,8L16,14 18,14 18,6 10,6 10,8 16,8 M6,12L6,18 14,18 14,12 6,12z">
                                     <GeometryDrawing.Brush>
                                         <SolidColorBrush x:Name="PolyFill" Color="{StaticResource IconColor}" />
                                     </GeometryDrawing.Brush>

+ 1 - 2
src/PicView/Views/UserControls/Buttons/X2.xaml

@@ -20,8 +20,7 @@
             Width="23"
             Height="23"
             Margin="7,0,0,11">
-            <Path
-                Data="M31.071,24l12.342-12.342c1.953-1.953,1.953-5.119,0-7.071c-1.951-1.952-5.119-1.952-7.07,0L24,16.93  L11.657,4.587c-1.951-1.952-5.119-1.952-7.07,0c-1.953,1.953-1.953,5.119,0,7.071L16.929,24L4.587,36.342  c-1.953,1.953-1.953,5.119,0,7.071c0.976,0.976,2.256,1.464,3.535,1.464s2.56-0.488,3.535-1.464L24,31.071l12.343,12.343  c0.976,0.976,2.256,1.464,3.535,1.464s2.56-0.488,3.535-1.464c1.953-1.953,1.953-5.119,0-7.071L31.071,24z">
+            <Path Data="M31.071,24l12.342-12.342c1.953-1.953,1.953-5.119,0-7.071c-1.951-1.952-5.119-1.952-7.07,0L24,16.93  L11.657,4.587c-1.951-1.952-5.119-1.952-7.07,0c-1.953,1.953-1.953,5.119,0,7.071L16.929,24L4.587,36.342  c-1.953,1.953-1.953,5.119,0,7.071c0.976,0.976,2.256,1.464,3.535,1.464s2.56-0.488,3.535-1.464L24,31.071l12.343,12.343  c0.976,0.976,2.256,1.464,3.535,1.464s2.56-0.488,3.535-1.464c1.953-1.953,1.953-5.119,0-7.071L31.071,24z">
                 <Path.Fill>
                     <SolidColorBrush x:Name="PolyFill" Color="{StaticResource MainColor}" />
                 </Path.Fill>

+ 1 - 3
src/PicView/Views/UserControls/Gallery/PicGallery.xaml.cs

@@ -1,6 +1,4 @@
-using System.Windows;
-using System.Windows.Input;
-using PicView.PicGallery;
+using PicView.PicGallery;
 
 namespace PicView.Views.UserControls.Gallery
 {

+ 2 - 2
src/PicView/Views/UserControls/Gallery/PicGalleryItem.xaml.cs

@@ -1,15 +1,15 @@
 using PicView.Animations;
 using PicView.ChangeImage;
 using PicView.FileHandling;
+using PicView.ImageHandling;
 using PicView.PicGallery;
 using PicView.Properties;
+using PicView.SystemIntegration;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Shapes;
-using PicView.ImageHandling;
 using static PicView.PicGallery.GalleryNavigation;
-using PicView.SystemIntegration;
 
 namespace PicView.Views.UserControls.Gallery
 {

+ 6 - 15
src/PicView/Views/UserControls/Menus/FileMenu.xaml

@@ -228,20 +228,17 @@
                                     <DrawingGroup ClipGeometry="M0,0 V472.615 H472.615 V0 H0 Z">
                                         <DrawingGroup>
                                             <DrawingGroup>
-                                                <GeometryDrawing Brush="{StaticResource LocationBorderFill}"
-                                                                 Geometry="F1 M472.615,472.615z M0,0z M228.106,76.308L228.106,76.308 167.385,17.231 0,17.231 0,137.813 472.615,137.813 472.615,76.308z" />
+                                                <GeometryDrawing Brush="{StaticResource LocationBorderFill}" Geometry="F1 M472.615,472.615z M0,0z M228.106,76.308L228.106,76.308 167.385,17.231 0,17.231 0,137.813 472.615,137.813 472.615,76.308z" />
                                             </DrawingGroup>
                                         </DrawingGroup>
                                         <DrawingGroup>
                                             <DrawingGroup>
-                                                <GeometryDrawing Brush="{StaticResource LocationBorderFill}"
-                                                                 Geometry="F1 M472.615,472.615z M0,0z M262.086,236.077C249.677,223.673 233.38,217.471 217.081,217.471 200.782,217.471 184.485,223.673 172.076,236.077 147.264,260.889 147.264,301.268 172.076,326.082 196.893,350.899 237.268,350.899 262.086,326.082 286.898,301.269 286.898,260.89 262.086,236.077z" />
+                                                <GeometryDrawing Brush="{StaticResource LocationBorderFill}" Geometry="F1 M472.615,472.615z M0,0z M262.086,236.077C249.677,223.673 233.38,217.471 217.081,217.471 200.782,217.471 184.485,223.673 172.076,236.077 147.264,260.889 147.264,301.268 172.076,326.082 196.893,350.899 237.268,350.899 262.086,326.082 286.898,301.269 286.898,260.89 262.086,236.077z" />
                                             </DrawingGroup>
                                         </DrawingGroup>
                                         <DrawingGroup>
                                             <DrawingGroup>
-                                                <GeometryDrawing Brush="{StaticResource LocationBorderFill}"
-                                                                 Geometry="F1 M472.615,472.615z M0,0z M0,157.505L0,305.231 0,455.385 236.308,455.385 472.616,455.385 472.616,305.231 472.616,157.505 0,157.505z M327.5,405.423L268.598,346.516C253.538,358.387 235.323,364.374 217.081,364.374 195.739,364.374 174.398,356.249 158.153,340.004 125.663,307.514 125.663,254.644 158.153,222.153 190.643,189.663 243.519,189.663 276.009,222.153 306.139,252.284 308.276,299.916 282.52,332.592L341.422,391.499 327.5,405.423z" />
+                                                <GeometryDrawing Brush="{StaticResource LocationBorderFill}" Geometry="F1 M472.615,472.615z M0,0z M0,157.505L0,305.231 0,455.385 236.308,455.385 472.616,455.385 472.616,305.231 472.616,157.505 0,157.505z M327.5,405.423L268.598,346.516C253.538,358.387 235.323,364.374 217.081,364.374 195.739,364.374 174.398,356.249 158.153,340.004 125.663,307.514 125.663,254.644 158.153,222.153 190.643,189.663 243.519,189.663 276.009,222.153 306.139,252.284 308.276,299.916 282.52,332.592L341.422,391.499 327.5,405.423z" />
                                             </DrawingGroup>
                                         </DrawingGroup>
                                     </DrawingGroup>
@@ -307,9 +304,7 @@
                         Data="M448 1536h896v-256h-896v256zm0-640h896v-384h-160q-40 0-68-28t-28-68v-160h-640v640zm1152 64q0-26-19-45t-45-19-45 19-19 45 19 45 45 19 45-19 19-45zm128 0v416q0 13-9.5 22.5t-22.5 9.5h-224v160q0 40-28 68t-68 28h-960q-40 0-68-28t-28-68v-160h-224q-13 0-22.5-9.5t-9.5-22.5v-416q0-79 56.5-135.5t135.5-56.5h64v-544q0-40 28-68t68-28h672q40 0 88 20t76 48l152 152q28 28 48 76t20 88v256h64q79 0 135.5 56.5t56.5 135.5z"
                         Fill="{StaticResource PrintBorderFill}"
                         Stretch="Fill" />
-                    <Button
-                        x:Name="PrintButton"
-                        ToolTip="{StaticResource RenameFile}">
+                    <Button x:Name="PrintButton" ToolTip="{StaticResource RenameFile}">
                         <Button.Content>
                             <TextBlock
                                 Margin="2,0,2,0"
@@ -336,9 +331,7 @@
                         Data="M64 0C28.7 0 0 28.7 0 64V448c0 35.3 28.7 64 64 64H320c35.3 0 64-28.7 64-64V428.7c-2.7 1.1-5.4 2-8.2 2.7l-60.1 15c-3 .7-6 1.2-9 1.4c-.9 .1-1.8 .2-2.7 .2H240c-6.1 0-11.6-3.4-14.3-8.8l-8.8-17.7c-1.7-3.4-5.1-5.5-8.8-5.5s-7.2 2.1-8.8 5.5l-8.8 17.7c-2.9 5.9-9.2 9.4-15.7 8.8s-12.1-5.1-13.9-11.3L144 381l-9.8 32.8c-6.1 20.3-24.8 34.2-46 34.2H80c-8.8 0-16-7.2-16-16s7.2-16 16-16h8.2c7.1 0 13.3-4.6 15.3-11.4l14.9-49.5c3.4-11.3 13.8-19.1 25.6-19.1s22.2 7.8 25.6 19.1l11.6 38.6c7.4-6.2 16.8-9.7 26.8-9.7c15.9 0 30.4 9 37.5 23.2l4.4 8.8h8.9c-3.1-8.8-3.7-18.4-1.4-27.8l15-60.1c2.8-11.3 8.6-21.5 16.8-29.7L384 203.6V160H256c-17.7 0-32-14.3-32-32V0H64zM256 0V128H384L256 0zM549.8 139.7c-15.6-15.6-40.9-15.6-56.6 0l-29.4 29.4 71 71 29.4-29.4c15.6-15.6 15.6-40.9 0-56.6l-14.4-14.4zM311.9 321c-4.1 4.1-7 9.2-8.4 14.9l-15 60.1c-1.4 5.5 .2 11.2 4.2 15.2s9.7 5.6 15.2 4.2l60.1-15c5.6-1.4 10.8-4.3 14.9-8.4L512.1 262.7l-71-71L311.9 321z"
                         Fill="{StaticResource RenameBorderFill}"
                         Stretch="Fill" />
-                    <Button
-                        x:Name="RenameButton"
-                        ToolTip="{StaticResource RenameFile}">
+                    <Button x:Name="RenameButton" ToolTip="{StaticResource RenameFile}">
                         <Button.Content>
                             <TextBlock
                                 Margin="3.7,0,2,0"
@@ -365,9 +358,7 @@
                         Data="M836 1169l-15 368-2 22-420-29q-36-3-67-31.5t-47-65.5q-11-27-14.5-55t4-65 12-55 21.5-64 19-53q78 12 509 28zm-387-586l180 379-147-92q-63 72-111.5 144.5t-72.5 125-39.5 94.5-18.5 63l-4 21-190-357q-17-26-18-56t6-47l8-18q35-63 114-188l-140-86zm1231 517l-188 359q-12 29-36.5 46.5t-43.5 20.5l-18 4q-71 7-219 12l8 164-230-367 211-362 7 173q170 16 283 5t170-33zm-785-924q-47 63-265 435l-317-187-19-12 225-356q20-31 60-42t80-10q24 2 48.5 12t42 21 41.5 33 36 34.5 36 39.5 32 35zm655 307l212 363q18 37 12.5 76t-27.5 74q-13 20-33 37t-38 28-48.5 22-47 16-51.5 14-46 12q-34-72-265-436l313-195zm-143-226l142-83-220 373-419-20 151-86q-34-89-75-166t-75.5-123.5-64.5-80-47-46.5l-17-13 405 1q31-3 58 10.5t39 28.5l11 15q39 61 112 190z"
                         Fill="{StaticResource RecycleButtonIconBrush}"
                         Stretch="Fill" />
-                    <Button
-                        x:Name="RecycleButton"
-                        ToolTip="{StaticResource SendCurrentImageToRecycleBin}">
+                    <Button x:Name="RecycleButton" ToolTip="{StaticResource SendCurrentImageToRecycleBin}">
 
                         <Button.Content>
                             <TextBlock

+ 6 - 12
src/PicView/Views/UserControls/Menus/ImageSettings.xaml

@@ -173,8 +173,7 @@
                                         <DrawingImage>
                                             <DrawingImage.Drawing>
                                                 <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                                    <GeometryDrawing Brush="{StaticResource ResizeIcon}"
-                                                                     Geometry="F1 M512,512z M0,0z M464,448L48,448C21.49,448,0,426.51,0,400L0,112C0,85.49,21.49,64,48,64L464,64C490.51,64,512,85.49,512,112L512,400C512,426.51,490.51,448,464,448z M112,120C81.072,120 56,145.072 56,176 56,206.928 81.072,232 112,232 142.928,232 168,206.928 168,176 168,145.072 142.928,120 112,120z M64,384L448,384 448,272 360.485,184.485C355.799,179.799,348.201,179.799,343.514,184.485L208,320 152.485,264.485C147.799,259.799,140.201,259.799,135.514,264.485L64,336 64,384z" />
+                                                    <GeometryDrawing Brush="{StaticResource ResizeIcon}" Geometry="F1 M512,512z M0,0z M464,448L48,448C21.49,448,0,426.51,0,400L0,112C0,85.49,21.49,64,48,64L464,64C490.51,64,512,85.49,512,112L512,400C512,426.51,490.51,448,464,448z M112,120C81.072,120 56,145.072 56,176 56,206.928 81.072,232 112,232 142.928,232 168,206.928 168,176 168,145.072 142.928,120 112,120z M64,384L448,384 448,272 360.485,184.485C355.799,179.799,348.201,179.799,343.514,184.485L208,320 152.485,264.485C147.799,259.799,140.201,259.799,135.514,264.485L64,336 64,384z" />
                                                 </DrawingGroup>
                                             </DrawingImage.Drawing>
                                         </DrawingImage>
@@ -189,8 +188,7 @@
                                         <DrawingImage>
                                             <DrawingImage.Drawing>
                                                 <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                                    <GeometryDrawing Brush="{StaticResource ResizeIcon}"
-                                                                     Geometry="F1 M512,512z M0,0z M464,448L48,448C21.49,448,0,426.51,0,400L0,112C0,85.49,21.49,64,48,64L464,64C490.51,64,512,85.49,512,112L512,400C512,426.51,490.51,448,464,448z M112,120C81.072,120 56,145.072 56,176 56,206.928 81.072,232 112,232 142.928,232 168,206.928 168,176 168,145.072 142.928,120 112,120z M64,384L448,384 448,272 360.485,184.485C355.799,179.799,348.201,179.799,343.514,184.485L208,320 152.485,264.485C147.799,259.799,140.201,259.799,135.514,264.485L64,336 64,384z" />
+                                                    <GeometryDrawing Brush="{StaticResource ResizeIcon}" Geometry="F1 M512,512z M0,0z M464,448L48,448C21.49,448,0,426.51,0,400L0,112C0,85.49,21.49,64,48,64L464,64C490.51,64,512,85.49,512,112L512,400C512,426.51,490.51,448,464,448z M112,120C81.072,120 56,145.072 56,176 56,206.928 81.072,232 112,232 142.928,232 168,206.928 168,176 168,145.072 142.928,120 112,120z M64,384L448,384 448,272 360.485,184.485C355.799,179.799,348.201,179.799,343.514,184.485L208,320 152.485,264.485C147.799,259.799,140.201,259.799,135.514,264.485L64,336 64,384z" />
                                                 </DrawingGroup>
                                             </DrawingImage.Drawing>
                                         </DrawingImage>
@@ -305,8 +303,7 @@
                                     <DrawingImage>
                                         <DrawingImage.Drawing>
                                             <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                                <GeometryDrawing
-                                                    Geometry="F1 M512,512z M0,0z M448,256C448,150 362,64 256,64 150,64 64,150 64,256 64,362 150,448 256,448 362,448 448,362 448,256z">
+                                                <GeometryDrawing Geometry="F1 M512,512z M0,0z M448,256C448,150 362,64 256,64 150,64 64,150 64,256 64,362 150,448 256,448 362,448 448,362 448,256z">
                                                     <GeometryDrawing.Pen>
                                                         <Pen
                                                             Brush="{StaticResource OptimizeIcon}"
@@ -317,8 +314,7 @@
                                                             Thickness="32" />
                                                     </GeometryDrawing.Pen>
                                                 </GeometryDrawing>
-                                                <GeometryDrawing
-                                                    Geometry="F1 M512,512z M0,0z M360,94.59L360,296 M443.13,212.87L296,360 M417.41,360L216,360 M299.13,443.13L155.13,299.13 M152,416L152,216 M68.87,299.13L212.87,155.13 M94.59,152L288,152 M212.87,68.87L360,216">
+                                                <GeometryDrawing Geometry="F1 M512,512z M0,0z M360,94.59L360,296 M443.13,212.87L296,360 M417.41,360L216,360 M299.13,443.13L155.13,299.13 M152,416L152,216 M68.87,299.13L212.87,155.13 M94.59,152L288,152 M212.87,68.87L360,216">
                                                     <GeometryDrawing.Pen>
                                                         <Pen
                                                             Brush="{StaticResource OptimizeIcon}"
@@ -370,10 +366,8 @@
                                         <DrawingImage>
                                             <DrawingImage.Drawing>
                                                 <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                                    <GeometryDrawing Brush="{StaticResource BottomGalleryIcon}"
-                                                                     Geometry="F1 M512,512z M0,0z M80,132L80,460A20,20,0,0,0,100,480L492,480A20,20,0,0,0,512,460L512,132A20,20,0,0,0,492,112L100,112A20,20,0,0,0,80,132z M373.14,173.33A46,46,0,1,1,326.86,219.33A46.19,46.19,0,0,1,373.14,173.33z M111.73,449.33L111.73,353.85 234.49,243.65 328.27,337 215.27,449.33z M480,449.33L259,449.33 403.58,305.33 480,370.59z" />
-                                                    <GeometryDrawing Brush="{StaticResource BottomGalleryIcon}"
-                                                                     Geometry="F1 M512,512z M0,0z M20,32A20,20,0,0,0,0,52L0,396A20,20,0,0,0,20,416L48,416 48,100A20,20,0,0,1,68,80L448,80 448,52A20,20,0,0,0,428,32z" />
+                                                    <GeometryDrawing Brush="{StaticResource BottomGalleryIcon}" Geometry="F1 M512,512z M0,0z M80,132L80,460A20,20,0,0,0,100,480L492,480A20,20,0,0,0,512,460L512,132A20,20,0,0,0,492,112L100,112A20,20,0,0,0,80,132z M373.14,173.33A46,46,0,1,1,326.86,219.33A46.19,46.19,0,0,1,373.14,173.33z M111.73,449.33L111.73,353.85 234.49,243.65 328.27,337 215.27,449.33z M480,449.33L259,449.33 403.58,305.33 480,370.59z" />
+                                                    <GeometryDrawing Brush="{StaticResource BottomGalleryIcon}" Geometry="F1 M512,512z M0,0z M20,32A20,20,0,0,0,0,52L0,396A20,20,0,0,0,20,416L48,416 48,100A20,20,0,0,1,68,80L448,80 448,52A20,20,0,0,0,428,32z" />
                                                 </DrawingGroup>
                                             </DrawingImage.Drawing>
                                         </DrawingImage>

+ 3 - 6
src/PicView/Views/UserControls/Menus/QuickSettingsMenu.xaml

@@ -50,8 +50,7 @@
                                     <DrawingImage>
                                         <DrawingImage.Drawing>
                                             <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                                <GeometryDrawing
-                                                    Geometry="F1 M512,512z M0,0z M277.42,247A24.68,24.68,0,0,0,273.34,241.53L255,223.44A21.63,21.63,0,0,0,248.44,218.87A20.93,20.93,0,0,0,225.16,223.14C218.8,229.4 207.16,240.82 186.16,261.57 146,301.3 71.43,367.89 37.71,396.29A16,16,0,0,0,36.62,419.83L75.62,459.26A16.13,16.13,0,0,0,99.29,458.37C128.53,424 195.59,349.37 235.29,310.14 255.68,290.08 267.11,278.56 273.58,272.2A21.76,21.76,0,0,0,277.42,247z">
+                                                <GeometryDrawing Geometry="F1 M512,512z M0,0z M277.42,247A24.68,24.68,0,0,0,273.34,241.53L255,223.44A21.63,21.63,0,0,0,248.44,218.87A20.93,20.93,0,0,0,225.16,223.14C218.8,229.4 207.16,240.82 186.16,261.57 146,301.3 71.43,367.89 37.71,396.29A16,16,0,0,0,36.62,419.83L75.62,459.26A16.13,16.13,0,0,0,99.29,458.37C128.53,424 195.59,349.37 235.29,310.14 255.68,290.08 267.11,278.56 273.58,272.2A21.76,21.76,0,0,0,277.42,247z">
                                                     <GeometryDrawing.Pen>
                                                         <Pen
                                                             Brush="{StaticResource SettingsIcon}"
@@ -61,8 +60,7 @@
                                                             Thickness="32" />
                                                     </GeometryDrawing.Pen>
                                                 </GeometryDrawing>
-                                                <GeometryDrawing
-                                                    Geometry="F1 M512,512z M0,0z M478.43,201L444.12,167A5.44,5.44,0,0,0,440.12,165.41A5.59,5.59,0,0,0,436.12,167L436.12,167A11.41,11.41,0,0,1,426.57,170.27C422.09,169.78 417.32,168.39 414.24,165.41 407.24,158.55 415.33,145.05 409.17,136.41A242.88,242.88,0,0,0,386.09,109.69C379.03,102.69,351.28,76.22,304.54,57.16A123.79,123.79,0,0,0,257.54,47.92C231.19,47.92 210.93,59.68 203.54,66.43 197.66,71.75 191.54,80.2 191.54,80.2A91.29,91.29,0,0,1,202.35,77A79.53,79.53,0,0,1,225.63,75.51C241.19,76.8 259.94,84.1 270,92 286.21,105 293.18,122.39 294.27,144.83 295.07,161.52 279.04,182.59 263.83,199.77A7.85,7.85,0,0,0,264.23,210.6L285.47,231.83A8,8,0,0,0,296.61,231.93C310.54,218.42 327.7,203.46 337.43,197.47 347.16,191.48 355.01,189.79 358.78,189.38A35.71,35.71,0,0,1,380.08,194A13.65,13.65,0,0,1,383.16,196.38C389.62,202.94,389.23,213.66,382.66,220.12L380.66,222.01A5.5,5.5,0,0,0,380.66,229.85L414.97,263.85A5.5,5.5,0,0,0,418.97,265.43A5.65,5.65,0,0,0,422.97,263.85L478.43,209A5.82,5.82,0,0,0,478.43,201z">
+                                                <GeometryDrawing Geometry="F1 M512,512z M0,0z M478.43,201L444.12,167A5.44,5.44,0,0,0,440.12,165.41A5.59,5.59,0,0,0,436.12,167L436.12,167A11.41,11.41,0,0,1,426.57,170.27C422.09,169.78 417.32,168.39 414.24,165.41 407.24,158.55 415.33,145.05 409.17,136.41A242.88,242.88,0,0,0,386.09,109.69C379.03,102.69,351.28,76.22,304.54,57.16A123.79,123.79,0,0,0,257.54,47.92C231.19,47.92 210.93,59.68 203.54,66.43 197.66,71.75 191.54,80.2 191.54,80.2A91.29,91.29,0,0,1,202.35,77A79.53,79.53,0,0,1,225.63,75.51C241.19,76.8 259.94,84.1 270,92 286.21,105 293.18,122.39 294.27,144.83 295.07,161.52 279.04,182.59 263.83,199.77A7.85,7.85,0,0,0,264.23,210.6L285.47,231.83A8,8,0,0,0,296.61,231.93C310.54,218.42 327.7,203.46 337.43,197.47 347.16,191.48 355.01,189.79 358.78,189.38A35.71,35.71,0,0,1,380.08,194A13.65,13.65,0,0,1,383.16,196.38C389.62,202.94,389.23,213.66,382.66,220.12L380.66,222.01A5.5,5.5,0,0,0,380.66,229.85L414.97,263.85A5.5,5.5,0,0,0,418.97,265.43A5.65,5.65,0,0,0,422.97,263.85L478.43,209A5.82,5.82,0,0,0,478.43,201z">
                                                     <GeometryDrawing.Pen>
                                                         <Pen
                                                             Brush="{StaticResource SettingsIcon}"
@@ -112,8 +110,7 @@
                                 <DrawingImage>
                                     <DrawingImage.Drawing>
                                         <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                            <GeometryDrawing Brush="{StaticResource AboutIcon}"
-                                                             Geometry="F1 M512,512z M0,0z M256,56C145.72,56 56,145.72 56,256 56,366.28 145.72,456 256,456 366.28,456 456,366.28 456,256 456,145.72 366.28,56 256,56z M256,138A26,26,0,1,1,230,164A26,26,0,0,1,256,138z M320,364L200,364 200,332 244,332 244,244 212,244 212,212 276,212 276,332 320,332z" />
+                                            <GeometryDrawing Brush="{StaticResource AboutIcon}" Geometry="F1 M512,512z M0,0z M256,56C145.72,56 56,145.72 56,256 56,366.28 145.72,456 256,456 366.28,456 456,366.28 456,256 456,145.72 366.28,56 256,56z M256,138A26,26,0,1,1,230,164A26,26,0,0,1,256,138z M320,364L200,364 200,332 244,332 244,244 212,244 212,212 276,212 276,332 320,332z" />
                                         </DrawingGroup>
                                     </DrawingImage.Drawing>
                                 </DrawingImage>

+ 6 - 12
src/PicView/Views/UserControls/Menus/ToolsAndEffectsMenu.xaml

@@ -79,8 +79,7 @@
                                         <DrawingImage>
                                             <DrawingImage.Drawing>
                                                 <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                                    <GeometryDrawing Brush="{StaticResource ResizeIconBrush}"
-                                                                     Geometry="F1 M512,512z M0,0z M464,448L48,448C21.49,448,0,426.51,0,400L0,112C0,85.49,21.49,64,48,64L464,64C490.51,64,512,85.49,512,112L512,400C512,426.51,490.51,448,464,448z M112,120C81.072,120 56,145.072 56,176 56,206.928 81.072,232 112,232 142.928,232 168,206.928 168,176 168,145.072 142.928,120 112,120z M64,384L448,384 448,272 360.485,184.485C355.799,179.799,348.201,179.799,343.514,184.485L208,320 152.485,264.485C147.799,259.799,140.201,259.799,135.514,264.485L64,336 64,384z" />
+                                                    <GeometryDrawing Brush="{StaticResource ResizeIconBrush}" Geometry="F1 M512,512z M0,0z M464,448L48,448C21.49,448,0,426.51,0,400L0,112C0,85.49,21.49,64,48,64L464,64C490.51,64,512,85.49,512,112L512,400C512,426.51,490.51,448,464,448z M112,120C81.072,120 56,145.072 56,176 56,206.928 81.072,232 112,232 142.928,232 168,206.928 168,176 168,145.072 142.928,120 112,120z M64,384L448,384 448,272 360.485,184.485C355.799,179.799,348.201,179.799,343.514,184.485L208,320 152.485,264.485C147.799,259.799,140.201,259.799,135.514,264.485L64,336 64,384z" />
                                                 </DrawingGroup>
                                             </DrawingImage.Drawing>
                                         </DrawingImage>
@@ -96,8 +95,7 @@
                                         <DrawingImage>
                                             <DrawingImage.Drawing>
                                                 <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                                    <GeometryDrawing Brush="{StaticResource ResizeIconBrush}"
-                                                                     Geometry="F1 M512,512z M0,0z M464,448L48,448C21.49,448,0,426.51,0,400L0,112C0,85.49,21.49,64,48,64L464,64C490.51,64,512,85.49,512,112L512,400C512,426.51,490.51,448,464,448z M112,120C81.072,120 56,145.072 56,176 56,206.928 81.072,232 112,232 142.928,232 168,206.928 168,176 168,145.072 142.928,120 112,120z M64,384L448,384 448,272 360.485,184.485C355.799,179.799,348.201,179.799,343.514,184.485L208,320 152.485,264.485C147.799,259.799,140.201,259.799,135.514,264.485L64,336 64,384z" />
+                                                    <GeometryDrawing Brush="{StaticResource ResizeIconBrush}" Geometry="F1 M512,512z M0,0z M464,448L48,448C21.49,448,0,426.51,0,400L0,112C0,85.49,21.49,64,48,64L464,64C490.51,64,512,85.49,512,112L512,400C512,426.51,490.51,448,464,448z M112,120C81.072,120 56,145.072 56,176 56,206.928 81.072,232 112,232 142.928,232 168,206.928 168,176 168,145.072 142.928,120 112,120z M64,384L448,384 448,272 360.485,184.485C355.799,179.799,348.201,179.799,343.514,184.485L208,320 152.485,264.485C147.799,259.799,140.201,259.799,135.514,264.485L64,336 64,384z" />
                                                 </DrawingGroup>
                                             </DrawingImage.Drawing>
                                         </DrawingImage>
@@ -113,8 +111,7 @@
                                         <DrawingImage>
                                             <DrawingImage.Drawing>
                                                 <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                                    <GeometryDrawing Brush="{StaticResource ResizeIconBrush}"
-                                                                     Geometry="F1 M512,512z M0,0z M464,448L48,448C21.49,448,0,426.51,0,400L0,112C0,85.49,21.49,64,48,64L464,64C490.51,64,512,85.49,512,112L512,400C512,426.51,490.51,448,464,448z M112,120C81.072,120 56,145.072 56,176 56,206.928 81.072,232 112,232 142.928,232 168,206.928 168,176 168,145.072 142.928,120 112,120z M64,384L448,384 448,272 360.485,184.485C355.799,179.799,348.201,179.799,343.514,184.485L208,320 152.485,264.485C147.799,259.799,140.201,259.799,135.514,264.485L64,336 64,384z" />
+                                                    <GeometryDrawing Brush="{StaticResource ResizeIconBrush}" Geometry="F1 M512,512z M0,0z M464,448L48,448C21.49,448,0,426.51,0,400L0,112C0,85.49,21.49,64,48,64L464,64C490.51,64,512,85.49,512,112L512,400C512,426.51,490.51,448,464,448z M112,120C81.072,120 56,145.072 56,176 56,206.928 81.072,232 112,232 142.928,232 168,206.928 168,176 168,145.072 142.928,120 112,120z M64,384L448,384 448,272 360.485,184.485C355.799,179.799,348.201,179.799,343.514,184.485L208,320 152.485,264.485C147.799,259.799,140.201,259.799,135.514,264.485L64,336 64,384z" />
                                                 </DrawingGroup>
                                             </DrawingImage.Drawing>
                                         </DrawingImage>
@@ -163,8 +160,7 @@
                                 <DrawingImage>
                                     <DrawingImage.Drawing>
                                         <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                            <GeometryDrawing Brush="{StaticResource EffectsIconBrush}"
-                                                             Geometry="F1 M512,512z M0,0z M469.11,382.76L325,153.92 325,74 357,74 357,32 155,32 155,74 187,74 187,153.92 42.89,382.76C29.89,403.4 28.11,426.49 39.89,447.86 51.67,469.23 71.59,480 96,480L416,480C440.41,480 460.32,469.24 472.1,447.86 483.88,426.48 482.14,403.4 469.11,382.76z M224.39,173.39A29.76,29.76,0,0,0,229.01,157.39L229.01,74 283.01,74 283.01,158.59A25.85,25.85,0,0,0,287.01,172.41L356.82,283 155.18,283z" />
+                                            <GeometryDrawing Brush="{StaticResource EffectsIconBrush}" Geometry="F1 M512,512z M0,0z M469.11,382.76L325,153.92 325,74 357,74 357,32 155,32 155,74 187,74 187,153.92 42.89,382.76C29.89,403.4 28.11,426.49 39.89,447.86 51.67,469.23 71.59,480 96,480L416,480C440.41,480 460.32,469.24 472.1,447.86 483.88,426.48 482.14,403.4 469.11,382.76z M224.39,173.39A29.76,29.76,0,0,0,229.01,157.39L229.01,74 283.01,74 283.01,158.59A25.85,25.85,0,0,0,287.01,172.41L356.82,283 155.18,283z" />
                                         </DrawingGroup>
                                     </DrawingImage.Drawing>
                                 </DrawingImage>
@@ -275,8 +271,7 @@
                                     <DrawingImage>
                                         <DrawingImage.Drawing>
                                             <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                                <GeometryDrawing
-                                                    Geometry="F1 M512,512z M0,0z M448,256C448,150 362,64 256,64 150,64 64,150 64,256 64,362 150,448 256,448 362,448 448,362 448,256z">
+                                                <GeometryDrawing Geometry="F1 M512,512z M0,0z M448,256C448,150 362,64 256,64 150,64 64,150 64,256 64,362 150,448 256,448 362,448 448,362 448,256z">
                                                     <GeometryDrawing.Pen>
                                                         <Pen
                                                             Brush="{StaticResource OptimizeIconBrush}"
@@ -287,8 +282,7 @@
                                                             Thickness="32" />
                                                     </GeometryDrawing.Pen>
                                                 </GeometryDrawing>
-                                                <GeometryDrawing
-                                                    Geometry="F1 M512,512z M0,0z M360,94.59L360,296 M443.13,212.87L296,360 M417.41,360L216,360 M299.13,443.13L155.13,299.13 M152,416L152,216 M68.87,299.13L212.87,155.13 M94.59,152L288,152 M212.87,68.87L360,216">
+                                                <GeometryDrawing Geometry="F1 M512,512z M0,0z M360,94.59L360,296 M443.13,212.87L296,360 M417.41,360L216,360 M299.13,443.13L155.13,299.13 M152,416L152,216 M68.87,299.13L212.87,155.13 M94.59,152L288,152 M212.87,68.87L360,216">
                                                     <GeometryDrawing.Pen>
                                                         <Pen
                                                             Brush="{StaticResource OptimizeIconBrush}"

+ 3 - 6
src/PicView/Views/UserControls/Misc/CustomTextBox.xaml

@@ -33,13 +33,11 @@
                                 Padding="5,5,5,5"
                                 BorderBrush="{DynamicResource ChosenColorBrush}"
                                 BorderThickness="1">
-                                <ScrollViewer x:Name="PART_ContentHost"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                <ScrollViewer x:Name="PART_ContentHost" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                             </Border>
                             <ControlTemplate.Triggers>
                                 <Trigger Property="IsFocused" Value="True">
-                                    <Setter TargetName="bg" Property="BorderBrush"
-                                            Value="{StaticResource ResourceKey=ChosenColorBrush}" />
+                                    <Setter TargetName="bg" Property="BorderBrush" Value="{StaticResource ResourceKey=ChosenColorBrush}" />
                                     <Setter TargetName="bg" Property="BorderThickness" Value="1" />
                                 </Trigger>
                             </ControlTemplate.Triggers>
@@ -47,8 +45,7 @@
                     </Setter.Value>
                 </Setter>
                 <Style.Triggers>
-                    <DataTrigger Binding="{Binding IsKeyboardFocused, RelativeSource={RelativeSource Self}}"
-                                 Value="false">
+                    <DataTrigger Binding="{Binding IsKeyboardFocused, RelativeSource={RelativeSource Self}}" Value="false">
                         <Setter Property="Template">
                             <Setter.Value>
                                 <ControlTemplate TargetType="TextBox">

+ 2 - 2
src/PicView/Views/UserControls/Misc/DragDropOverlayPic.xaml.cs

@@ -1,6 +1,6 @@
-using System.Windows.Media;
-using PicView.UILogic;
+using PicView.UILogic;
 using PicView.UILogic.Sizing;
+using System.Windows.Media;
 
 namespace PicView.Views.UserControls.Misc
 {

+ 2 - 4
src/PicView/Views/UserControls/Misc/Icon.xaml

@@ -11,10 +11,8 @@
                 <DrawingImage.Drawing>
                     <DrawingGroup ClipGeometry="M0,0 V329.25937 H333.44974 V0 H0 Z">
                         <DrawingGroup>
-                            <GeometryDrawing Brush="{DynamicResource ChosenColorBrush}"
-                                             Geometry="F1 M333.44974,329.25937z M0,0z M329.796,130.208L311.354,177.826 304.172,196.392 286.112,243.011 280.229,258.204C279.6,259.845,277.133,259.397,277.133,257.644L277.133,214.336C277.133,214.143,277.164,213.949,277.236,213.776L289.486,182.156 296.669,163.58 306.194,138.991C306.514,138.176,306.101,137.259,305.265,136.953L278.155,126.723C277.536,126.488,277.123,125.897,277.123,125.245L277.123,109.094C277.123,107.983,278.248,107.219,279.3,107.617L328.888,126.346C311.406,53.8949 245.461,0 166.74,0 121.569,0 80.6197,17.7714 50.5885,46.5785L255.368,46.5785C257.928,46.5785,260.012,48.6267,260.012,51.164L260.012,263.198C260.012,265.725,257.938,267.783,255.368,267.783L40.6298,267.783C38.0705,267.783,35.9858,265.735,35.9858,263.198L35.9858,62.5258C13.4779,90.5891 0,126.05 0,164.63 0,255.555 74.6445,329.259 166.73,329.259 184.625,329.259 201.849,326.447 218.01,321.291L210.972,318.631 203.531,315.819 120.971,284.648 269.971,284.648 269.207,286.594 264.935,297.63C306.452,267.681 333.449,219.279 333.449,164.62 333.47,152.819 332.18,141.315 329.796,130.208L329.796,130.208z" />
-                            <GeometryDrawing Brush="{DynamicResource ChosenAccentColorBrush}"
-                                             Geometry="F0 M333.44974,329.25937z M0,0z M62.2502,219.656L73.9737,219.656C80.4857,212.339 86.9666,205.033 93.4579,197.717 95.0265,195.944 96.6261,194.211 98.0709,192.357 98.8862,191.348 99.5054,191.287 100.537,191.99 105.563,195.403 110.63,198.725 115.646,202.19 117.018,203.138 117.689,203.464 118.752,201.629 125.14,190.543 131.725,179.609 138.154,168.543 138.928,167.228 139.403,167.452 140.362,168.135 147.432,173.118 154.532,178.08 161.621,183.053 162.375,183.573 163.149,184.062 163.913,184.582 171.384,169.297 178.784,154.154 186.379,138.625 188.484,142.762 190.425,146.553 192.365,150.343 204.191,173.454 216.018,196.545 227.835,219.656L236.514,219.656C239.083,219.656,241.147,217.597,241.147,215.06L241.147,69.4041C241.147,67.3967 239.847,65.7051 238.031,65.0835 237.556,64.9205 237.05,64.8084 236.524,64.8084L62.2502,64.8084C59.6806,64.8084,57.6166,66.8668,57.6166,69.4041L57.6166,215.06C57.6166,216.15 58.0191,217.149 58.6589,217.933 59.5051,218.973 60.7848,219.656 62.2502,219.656L62.2502,219.656z M105.119,125.969C116.203,126.631 124.583,135.619 124.284,146.654 123.953,159.188 114.16,166.963 103.375,166.739 90.7024,166.474 82.9521,156.773 82.8282,145.992 83.2721,134.039 92.8696,125.245 105.119,125.969L105.119,125.969z" />
+                            <GeometryDrawing Brush="{DynamicResource ChosenColorBrush}" Geometry="F1 M333.44974,329.25937z M0,0z M329.796,130.208L311.354,177.826 304.172,196.392 286.112,243.011 280.229,258.204C279.6,259.845,277.133,259.397,277.133,257.644L277.133,214.336C277.133,214.143,277.164,213.949,277.236,213.776L289.486,182.156 296.669,163.58 306.194,138.991C306.514,138.176,306.101,137.259,305.265,136.953L278.155,126.723C277.536,126.488,277.123,125.897,277.123,125.245L277.123,109.094C277.123,107.983,278.248,107.219,279.3,107.617L328.888,126.346C311.406,53.8949 245.461,0 166.74,0 121.569,0 80.6197,17.7714 50.5885,46.5785L255.368,46.5785C257.928,46.5785,260.012,48.6267,260.012,51.164L260.012,263.198C260.012,265.725,257.938,267.783,255.368,267.783L40.6298,267.783C38.0705,267.783,35.9858,265.735,35.9858,263.198L35.9858,62.5258C13.4779,90.5891 0,126.05 0,164.63 0,255.555 74.6445,329.259 166.73,329.259 184.625,329.259 201.849,326.447 218.01,321.291L210.972,318.631 203.531,315.819 120.971,284.648 269.971,284.648 269.207,286.594 264.935,297.63C306.452,267.681 333.449,219.279 333.449,164.62 333.47,152.819 332.18,141.315 329.796,130.208L329.796,130.208z" />
+                            <GeometryDrawing Brush="{DynamicResource ChosenAccentColorBrush}" Geometry="F0 M333.44974,329.25937z M0,0z M62.2502,219.656L73.9737,219.656C80.4857,212.339 86.9666,205.033 93.4579,197.717 95.0265,195.944 96.6261,194.211 98.0709,192.357 98.8862,191.348 99.5054,191.287 100.537,191.99 105.563,195.403 110.63,198.725 115.646,202.19 117.018,203.138 117.689,203.464 118.752,201.629 125.14,190.543 131.725,179.609 138.154,168.543 138.928,167.228 139.403,167.452 140.362,168.135 147.432,173.118 154.532,178.08 161.621,183.053 162.375,183.573 163.149,184.062 163.913,184.582 171.384,169.297 178.784,154.154 186.379,138.625 188.484,142.762 190.425,146.553 192.365,150.343 204.191,173.454 216.018,196.545 227.835,219.656L236.514,219.656C239.083,219.656,241.147,217.597,241.147,215.06L241.147,69.4041C241.147,67.3967 239.847,65.7051 238.031,65.0835 237.556,64.9205 237.05,64.8084 236.524,64.8084L62.2502,64.8084C59.6806,64.8084,57.6166,66.8668,57.6166,69.4041L57.6166,215.06C57.6166,216.15 58.0191,217.149 58.6589,217.933 59.5051,218.973 60.7848,219.656 62.2502,219.656L62.2502,219.656z M105.119,125.969C116.203,126.631 124.583,135.619 124.284,146.654 123.953,159.188 114.16,166.963 103.375,166.739 90.7024,166.474 82.9521,156.773 82.8282,145.992 83.2721,134.039 92.8696,125.245 105.119,125.969L105.119,125.969z" />
                         </DrawingGroup>
                     </DrawingGroup>
                 </DrawingImage.Drawing>

+ 1 - 3
src/PicView/Views/UserControls/Misc/LinkChain.xaml

@@ -12,9 +12,7 @@
         Height="512"
         ClipToBounds="True">
         <Canvas.Resources>
-            <PathGeometry
-                x:Key="Mask1"
-                Figures="M0 0L512 0L512 512L0 512L0 0Z">
+            <PathGeometry x:Key="Mask1" Figures="M0 0L512 0L512 512L0 512L0 0Z">
                 <PathGeometry.Transform>
                     <TranslateTransform X="-50.21198" Y="0" />
                 </PathGeometry.Transform>

+ 3 - 3
src/PicView/Views/UserControls/Misc/QuickResize.xaml.cs

@@ -1,14 +1,14 @@
-using System.Globalization;
-using PicView.Animations;
+using PicView.Animations;
+using PicView.Properties;
 using PicView.Shortcuts;
 using PicView.UILogic;
 using PicView.UILogic.Sizing;
+using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
-using PicView.Properties;
 using Timer = System.Timers.Timer;
 
 namespace PicView.Views.UserControls.Misc

Разница между файлами не показана из-за своего большого размера
+ 0 - 1
src/PicView/Views/UserControls/Misc/StartUpUC.xaml


+ 2 - 6
src/PicView/Views/UserControls/Misc/StartUpUC.xaml.cs

@@ -1,13 +1,9 @@
-using PicView.ChangeImage;
-using PicView.ConfigureSettings;
+using PicView.Animations;
+using PicView.ChangeImage;
 using PicView.FileHandling;
 using PicView.Properties;
-using PicView.UILogic;
 using System.Windows;
 using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Threading;
-using PicView.Animations;
 using static PicView.Animations.MouseOverAnimations;
 
 namespace PicView.Views.UserControls.Misc

+ 1 - 3
src/PicView/Views/UserControls/Misc/ZipIcon.xaml

@@ -12,9 +12,7 @@
         Height="265"
         ClipToBounds="True">
         <Canvas.Resources>
-            <PathGeometry
-                x:Key="Mask1"
-                Figures="M0 0L265 0L265 265L0 265L0 0Z">
+            <PathGeometry x:Key="Mask1" Figures="M0 0L265 0L265 265L0 265L0 0Z">
                 <PathGeometry.Transform>
                     <TranslateTransform X="-30.75894" Y="0" />
                 </PathGeometry.Transform>

+ 0 - 4
src/PicView/Views/Windows/AboutWindow.xaml

@@ -352,10 +352,6 @@
                         </Image>
                     </Button>
                 </Border>
-
-                
-
-                
             </StackPanel>
         </ScrollViewer>
     </DockPanel>

+ 74 - 76
src/PicView/Views/Windows/ImageInfoWindow.xaml

@@ -22,99 +22,99 @@
 
     <Window.Resources>
         <StackPanel
-        x:Key="GPS"
-        Height="20"
-        Margin="0,15,0,10"
-        Orientation="Horizontal">
+            x:Key="GPS"
+            Height="20"
+            Margin="0,15,0,10"
+            Orientation="Horizontal">
             <Rectangle
-            Width="372"
-            Height="1"
-            Margin="0,0,7,0"
-            Fill="{StaticResource BorderBrush}" />
+                Width="372"
+                Height="1"
+                Margin="0,0,7,0"
+                Fill="{StaticResource BorderBrush}" />
             <Path
-            Data="M172.268 501.67C26.97 291.031 0 269.413 0 192 0 85.961 85.961 0 192 0s192 85.961 192 192c0 77.413-26.97 99.031-172.268 309.67-9.535 13.774-29.93 13.773-39.464 0zM192 272c44.183 0 80-35.817 80-80s-35.817-80-80-80-80 35.817-80 80 35.817 80 80 80z"
-            Fill="{StaticResource IconColorBrush}"
-            Stretch="Uniform" />
+                Data="M172.268 501.67C26.97 291.031 0 269.413 0 192 0 85.961 85.961 0 192 0s192 85.961 192 192c0 77.413-26.97 99.031-172.268 309.67-9.535 13.774-29.93 13.773-39.464 0zM192 272c44.183 0 80-35.817 80-80s-35.817-80-80-80-80 35.817-80 80 35.817 80 80 80z"
+                Fill="{StaticResource IconColorBrush}"
+                Stretch="Uniform" />
             <Rectangle
-            Width="372"
-            Height="1"
-            Margin="7,0,0,0"
-            Fill="{StaticResource BorderBrush}" />
+                Width="372"
+                Height="1"
+                Margin="7,0,0,0"
+                Fill="{StaticResource BorderBrush}" />
         </StackPanel>
 
         <StackPanel
-        x:Key="Origin"
-        Height="20"
-        Margin="0,15,0,10"
-        Orientation="Horizontal">
+            x:Key="Origin"
+            Height="20"
+            Margin="0,15,0,10"
+            Orientation="Horizontal">
             <Rectangle
-            Width="372"
-            Height="1"
-            Margin="0,0,7,0"
-            Fill="{StaticResource BorderBrush}" />
+                Width="372"
+                Height="1"
+                Margin="0,0,7,0"
+                Fill="{StaticResource BorderBrush}" />
             <Path
-            Data="M256 8C118.941 8 8 118.919 8 256c0 137.059 110.919 248 248 248 48.154 0 95.342-14.14 135.408-40.223 12.005-7.815 14.625-24.288 5.552-35.372l-10.177-12.433c-7.671-9.371-21.179-11.667-31.373-5.129C325.92 429.757 291.314 440 256 440c-101.458 0-184-82.542-184-184S154.542 72 256 72c100.139 0 184 57.619 184 160 0 38.786-21.093 79.742-58.17 83.693-17.349-.454-16.91-12.857-13.476-30.024l23.433-121.11C394.653 149.75 383.308 136 368.225 136h-44.981a13.518 13.518 0 0 0-13.432 11.993l-.01.092c-14.697-17.901-40.448-21.775-59.971-21.775-74.58 0-137.831 62.234-137.831 151.46 0 65.303 36.785 105.87 96 105.87 26.984 0 57.369-15.637 74.991-38.333 9.522 34.104 40.613 34.103 70.71 34.103C462.609 379.41 504 307.798 504 232 504 95.653 394.023 8 256 8zm-21.68 304.43c-22.249 0-36.07-15.623-36.07-40.771 0-44.993 30.779-72.729 58.63-72.729 22.292 0 35.601 15.241 35.601 40.77 0 45.061-33.875 72.73-58.161 72.73z"
-            Fill="{StaticResource IconColorBrush}"
-            Stretch="Uniform" />
+                Data="M256 8C118.941 8 8 118.919 8 256c0 137.059 110.919 248 248 248 48.154 0 95.342-14.14 135.408-40.223 12.005-7.815 14.625-24.288 5.552-35.372l-10.177-12.433c-7.671-9.371-21.179-11.667-31.373-5.129C325.92 429.757 291.314 440 256 440c-101.458 0-184-82.542-184-184S154.542 72 256 72c100.139 0 184 57.619 184 160 0 38.786-21.093 79.742-58.17 83.693-17.349-.454-16.91-12.857-13.476-30.024l23.433-121.11C394.653 149.75 383.308 136 368.225 136h-44.981a13.518 13.518 0 0 0-13.432 11.993l-.01.092c-14.697-17.901-40.448-21.775-59.971-21.775-74.58 0-137.831 62.234-137.831 151.46 0 65.303 36.785 105.87 96 105.87 26.984 0 57.369-15.637 74.991-38.333 9.522 34.104 40.613 34.103 70.71 34.103C462.609 379.41 504 307.798 504 232 504 95.653 394.023 8 256 8zm-21.68 304.43c-22.249 0-36.07-15.623-36.07-40.771 0-44.993 30.779-72.729 58.63-72.729 22.292 0 35.601 15.241 35.601 40.77 0 45.061-33.875 72.73-58.161 72.73z"
+                Fill="{StaticResource IconColorBrush}"
+                Stretch="Uniform" />
             <Rectangle
-            Width="372"
-            Height="1"
-            Margin="7,0,0,0"
-            Fill="{StaticResource BorderBrush}" />
+                Width="372"
+                Height="1"
+                Margin="7,0,0,0"
+                Fill="{StaticResource BorderBrush}" />
         </StackPanel>
 
         <StackPanel
-        x:Key="Image"
-        Height="20"
-        Margin="0,15,0,10"
-        Orientation="Horizontal">
+            x:Key="Image"
+            Height="20"
+            Margin="0,15,0,10"
+            Orientation="Horizontal">
             <Rectangle
-            Width="372"
-            Height="1"
-            Margin="0,0,7,0"
-            Fill="{StaticResource BorderBrush}" />
+                Width="372"
+                Height="1"
+                Margin="0,0,7,0"
+                Fill="{StaticResource BorderBrush}" />
             <Path
-            Data="M384 121.941V128H256V0h6.059a24 24 0 0 1 16.97 7.029l97.941 97.941a24.002 24.002 0 0 1 7.03 16.971zM248 160c-13.2 0-24-10.8-24-24V0H24C10.745 0 0 10.745 0 24v464c0 13.255 10.745 24 24 24h336c13.255 0 24-10.745 24-24V160H248zm-135.455 16c26.51 0 48 21.49 48 48s-21.49 48-48 48-48-21.49-48-48 21.491-48 48-48zm208 240h-256l.485-48.485L104.545 328c4.686-4.686 11.799-4.201 16.485.485L160.545 368 264.06 264.485c4.686-4.686 12.284-4.686 16.971 0L320.545 304v112z"
-            Fill="{StaticResource IconColorBrush}"
-            Stretch="Uniform" />
+                Data="M384 121.941V128H256V0h6.059a24 24 0 0 1 16.97 7.029l97.941 97.941a24.002 24.002 0 0 1 7.03 16.971zM248 160c-13.2 0-24-10.8-24-24V0H24C10.745 0 0 10.745 0 24v464c0 13.255 10.745 24 24 24h336c13.255 0 24-10.745 24-24V160H248zm-135.455 16c26.51 0 48 21.49 48 48s-21.49 48-48 48-48-21.49-48-48 21.491-48 48-48zm208 240h-256l.485-48.485L104.545 328c4.686-4.686 11.799-4.201 16.485.485L160.545 368 264.06 264.485c4.686-4.686 12.284-4.686 16.971 0L320.545 304v112z"
+                Fill="{StaticResource IconColorBrush}"
+                Stretch="Uniform" />
             <Rectangle
-            Width="372"
-            Height="1"
-            Margin="7,0,0,0"
-            Fill="{StaticResource BorderBrush}" />
+                Width="372"
+                Height="1"
+                Margin="7,0,0,0"
+                Fill="{StaticResource BorderBrush}" />
         </StackPanel>
 
         <StackPanel
-        x:Key="Film"
-        Height="20"
-        Margin="0,15,0,10"
-        Orientation="Horizontal">
+            x:Key="Film"
+            Height="20"
+            Margin="0,15,0,10"
+            Orientation="Horizontal">
             <Rectangle
-            Width="372"
-            Height="1"
-            Margin="0,0,7,0"
-            Fill="{StaticResource BorderBrush}" />
+                Width="372"
+                Height="1"
+                Margin="0,0,7,0"
+                Fill="{StaticResource BorderBrush}" />
             <Path
-            Data="M488 64h-8v20c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12V64H96v20c0 6.6-5.4 12-12 12H44c-6.6 0-12-5.4-12-12V64h-8C10.7 64 0 74.7 0 88v336c0 13.3 10.7 24 24 24h8v-20c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v20h320v-20c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v20h8c13.3 0 24-10.7 24-24V88c0-13.3-10.7-24-24-24zM96 372c0 6.6-5.4 12-12 12H44c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40zm0-96c0 6.6-5.4 12-12 12H44c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40zm0-96c0 6.6-5.4 12-12 12H44c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40zm272 208c0 6.6-5.4 12-12 12H156c-6.6 0-12-5.4-12-12v-96c0-6.6 5.4-12 12-12h200c6.6 0 12 5.4 12 12v96zm0-168c0 6.6-5.4 12-12 12H156c-6.6 0-12-5.4-12-12v-96c0-6.6 5.4-12 12-12h200c6.6 0 12 5.4 12 12v96zm112 152c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40zm0-96c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40zm0-96c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40z"
-            Fill="{StaticResource IconColorBrush}"
-            Stretch="Uniform" />
+                Data="M488 64h-8v20c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12V64H96v20c0 6.6-5.4 12-12 12H44c-6.6 0-12-5.4-12-12V64h-8C10.7 64 0 74.7 0 88v336c0 13.3 10.7 24 24 24h8v-20c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v20h320v-20c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v20h8c13.3 0 24-10.7 24-24V88c0-13.3-10.7-24-24-24zM96 372c0 6.6-5.4 12-12 12H44c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40zm0-96c0 6.6-5.4 12-12 12H44c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40zm0-96c0 6.6-5.4 12-12 12H44c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40zm272 208c0 6.6-5.4 12-12 12H156c-6.6 0-12-5.4-12-12v-96c0-6.6 5.4-12 12-12h200c6.6 0 12 5.4 12 12v96zm0-168c0 6.6-5.4 12-12 12H156c-6.6 0-12-5.4-12-12v-96c0-6.6 5.4-12 12-12h200c6.6 0 12 5.4 12 12v96zm112 152c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40zm0-96c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40zm0-96c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40z"
+                Fill="{StaticResource IconColorBrush}"
+                Stretch="Uniform" />
             <Rectangle
-            Width="372"
-            Height="1"
-            Margin="7,0,0,0"
-            Fill="{StaticResource BorderBrush}" />
+                Width="372"
+                Height="1"
+                Margin="7,0,0,0"
+                Fill="{StaticResource BorderBrush}" />
         </StackPanel>
 
         <StackPanel
-        x:Key="Camera"
-        Height="20"
-        Margin="0,15,0,10"
-        Orientation="Horizontal">
+            x:Key="Camera"
+            Height="20"
+            Margin="0,15,0,10"
+            Orientation="Horizontal">
             <Rectangle
-            Width="372"
-            Height="1"
-            Margin="0,0,7,0"
-            Fill="{StaticResource BorderBrush}" />
+                Width="372"
+                Height="1"
+                Margin="0,0,7,0"
+                Fill="{StaticResource BorderBrush}" />
             <Image>
                 <Image.Source>
                     <DrawingImage>
@@ -127,10 +127,10 @@
                 </Image.Source>
             </Image>
             <Rectangle
-            Width="372"
-            Height="1"
-            Margin="7,0,0,0"
-            Fill="{StaticResource BorderBrush}" />
+                Width="372"
+                Height="1"
+                Margin="7,0,0,0"
+                Fill="{StaticResource BorderBrush}" />
         </StackPanel>
 
         <Style x:Key="bgRoundedConer" TargetType="Border">
@@ -593,11 +593,9 @@
                                         <DrawingImage>
                                             <DrawingImage.Drawing>
                                                 <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                                    <GeometryDrawing x:Name="xGeo"
-                                                                     Geometry="F1 M512,512z M0,0z M98,190.06L237.78,353.18A24,24,0,0,0,274.22,353.18L414,190.06C427.34,174.49,416.28,150.44,395.78,150.44L116.18,150.44C95.6799999999999,150.44,84.6199999999999,174.49,97.9999999999999,190.06z">
+                                                    <GeometryDrawing x:Name="xGeo" Geometry="F1 M512,512z M0,0z M98,190.06L237.78,353.18A24,24,0,0,0,274.22,353.18L414,190.06C427.34,174.49,416.28,150.44,395.78,150.44L116.18,150.44C95.6799999999999,150.44,84.6199999999999,174.49,97.9999999999999,190.06z">
                                                         <GeometryDrawing.Brush>
-                                                            <SolidColorBrush x:Name="chevronDownBrush"
-                                                                             Color="{StaticResource IconColor}" />
+                                                            <SolidColorBrush x:Name="chevronDownBrush" Color="{StaticResource IconColor}" />
                                                         </GeometryDrawing.Brush>
                                                     </GeometryDrawing>
                                                 </DrawingGroup>

+ 4 - 8
src/PicView/Views/Windows/MainWindow.xaml

@@ -69,11 +69,9 @@
                             <DrawingImage>
                                 <DrawingImage.Drawing>
                                     <DrawingGroup>
-                                        <GeometryDrawing
-                                            Geometry="F1 M22 16L22 4C22 2.9 21.1 2 20 2L8 2C6.9 2 6 2.9 6 4L6 16C6 17.1 6.9 18 8 18L20 18C21.1 18 22 17.1 22 16ZM11 12L13.03 14.71L16 11L20 16L8 16L11 12ZM2 6L2 20C2 21.1 2.9 22 4 22L18 22L18 20L4 20L4 6L2 6Z">
+                                        <GeometryDrawing Geometry="F1 M22 16L22 4C22 2.9 21.1 2 20 2L8 2C6.9 2 6 2.9 6 4L6 16C6 17.1 6.9 18 8 18L20 18C21.1 18 22 17.1 22 16ZM11 12L13.03 14.71L16 11L20 16L8 16L11 12ZM2 6L2 20C2 21.1 2.9 22 4 22L18 22L18 20L4 20L4 6L2 6Z">
                                             <GeometryDrawing.Brush>
-                                                <SolidColorBrush x:Name="GalleryBrush"
-                                                                 Color="{StaticResource IconColor}" />
+                                                <SolidColorBrush x:Name="GalleryBrush" Color="{StaticResource IconColor}" />
                                             </GeometryDrawing.Brush>
                                         </GeometryDrawing>
                                     </DrawingGroup>
@@ -346,8 +344,7 @@
                             <DrawingImage>
                                 <DrawingImage.Drawing>
                                     <DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
-                                        <DrawingGroup
-                                            Transform="0.707106781186548,-0.707106781186547,0.707106781186547,0.707106781186548,-129.23,312">
+                                        <DrawingGroup Transform="0.707106781186548,-0.707106781186547,0.707106781186547,0.707106781186548,-129.23,312">
                                             <GeometryDrawing>
                                                 <GeometryDrawing.Pen>
                                                     <Pen
@@ -365,8 +362,7 @@
                                                 </GeometryDrawing.Geometry>
                                             </GeometryDrawing>
                                         </DrawingGroup>
-                                        <DrawingGroup
-                                            Transform="0.707106781186548,-0.707106781186547,0.707106781186547,0.707106781186548,-87.81,212">
+                                        <DrawingGroup Transform="0.707106781186548,-0.707106781186547,0.707106781186547,0.707106781186548,-87.81,212">
                                             <GeometryDrawing Brush="{StaticResource MagicBrush}">
                                                 <GeometryDrawing.Geometry>
                                                     <RectangleGeometry

+ 4 - 9
src/PicView/Views/Windows/ResizeWindow.xaml

@@ -34,19 +34,15 @@
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ScrollBar}">
-                        <Track
-                            Name="PART_Track"
-                            IsDirectionReversed="True">
+                        <Track Name="PART_Track" IsDirectionReversed="True">
                             <Track.DecreaseRepeatButton>
-                                <RepeatButton Command="ScrollBar.PageUpCommand"
-                                              Style="{StaticResource ScrollBarPageButtonStyle}" />
+                                <RepeatButton Command="ScrollBar.PageUpCommand" Style="{StaticResource ScrollBarPageButtonStyle}" />
                             </Track.DecreaseRepeatButton>
                             <Track.Thumb>
                                 <Thumb Style="{StaticResource VerticalScrollBarThumbStyle}" />
                             </Track.Thumb>
                             <Track.IncreaseRepeatButton>
-                                <RepeatButton Command="ScrollBar.PageDownCommand"
-                                              Style="{StaticResource ScrollBarPageButtonStyle}" />
+                                <RepeatButton Command="ScrollBar.PageDownCommand" Style="{StaticResource ScrollBarPageButtonStyle}" />
                             </Track.IncreaseRepeatButton>
                         </Track>
                     </ControlTemplate>
@@ -247,8 +243,7 @@
                         <Style TargetType="StackPanel">
                             <Setter Property="Visibility" Value="Collapsed" />
                             <Style.Triggers>
-                                <DataTrigger Binding="{Binding ElementName=PercentageResize, Path=IsSelected}"
-                                             Value="True">
+                                <DataTrigger Binding="{Binding ElementName=PercentageResize, Path=IsSelected}" Value="True">
                                     <Setter Property="Visibility" Value="Visible" />
                                 </DataTrigger>
                             </Style.Triggers>

+ 1 - 2
src/XamlAnimatedGif/AnimationErrorEventArgs.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Windows;
+using System.Windows;
 
 namespace XamlAnimatedGif;
 

+ 2 - 7
src/XamlAnimatedGif/Animator.cs

@@ -1,14 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
+using System.IO;
+using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
-using System.Runtime.InteropServices;
 using XamlAnimatedGif.Decoding;
 using XamlAnimatedGif.Decompression;
 using XamlAnimatedGif.Extensions;

+ 0 - 2
src/XamlAnimatedGif/BrushAnimator.cs

@@ -1,6 +1,4 @@
-using System;
 using System.IO;
-using System.Threading.Tasks;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 using XamlAnimatedGif.Decoding;

+ 1 - 2
src/XamlAnimatedGif/Decoding/InvalidSignatureException.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 
 namespace XamlAnimatedGif.Decoding;
 

+ 0 - 2
src/XamlAnimatedGif/ImageAnimator.cs

@@ -1,6 +1,4 @@
-using System;
 using System.IO;
-using System.Threading.Tasks;
 using System.Windows.Controls;
 using System.Windows.Media.Animation;
 using XamlAnimatedGif.Decoding;

+ 0 - 4
src/XamlAnimatedGif/TimingManager.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Windows.Media.Animation;
 
 namespace XamlAnimatedGif;

Некоторые файлы не были показаны из-за большого количества измененных файлов