From 56596fb229c988b7d70693591b6663fe21b42c00 Mon Sep 17 00:00:00 2001
From: XTigerHyperX <xtigerhyperx@gmail.com>
Date: Mon, 24 May 2021 13:16:17 +0100
Subject: [PATCH 1/2] slider update by click

---
 FModel/Views/ImageMerger.xaml    | 4 ++--
 FModel/Views/ImageMerger.xaml.cs | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/FModel/Views/ImageMerger.xaml b/FModel/Views/ImageMerger.xaml
index ffd60a5d..cda98bba 100644
--- a/FModel/Views/ImageMerger.xaml
+++ b/FModel/Views/ImageMerger.xaml
@@ -54,11 +54,11 @@
                     
                     <TextBlock Grid.Row="0" Grid.Column="0" Text="Images Per Row" VerticalAlignment="Center" Margin="0 0 10 0" />
                     <Slider x:Name="SizeSlider" Grid.Row="0" Grid.Column="1" TickPlacement="None" AutoToolTipPlacement="BottomRight"
-                            IsMoveToPointEnabled="True" Minimum="2" Maximum="20" TickFrequency="1" Thumb.DragCompleted="DrawPreview"/>
+                            IsMoveToPointEnabled="True" Minimum="2" Maximum="20" TickFrequency="1" MouseUp="Click_DrawPreview" Thumb.DragCompleted="DrawPreview"/>
                     <TextBlock Grid.Row="2" Grid.Column="0" Text="Margin Between Images" VerticalAlignment="Center" Margin="0 0 10 0" />
                     <Slider Grid.Row="2" Grid.Column="1" Value="{Binding ImageMergerMargin, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}"
                             TickPlacement="None" AutoToolTipPlacement="BottomRight" IsMoveToPointEnabled="True" Minimum="0" Maximum="50" TickFrequency="1"
-                            Thumb.DragCompleted="DrawPreview" />
+                            MouseUp="Click_DrawPreview" Thumb.DragCompleted="DrawPreview" />
                 </Grid>
                 <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Center">
                     <Button x:Name="AddButton" Content="Add" MinWidth="80" Padding="1,3,1,3" Click="OnImageAdd"/>
diff --git a/FModel/Views/ImageMerger.xaml.cs b/FModel/Views/ImageMerger.xaml.cs
index 3327a7f3..72a2ed88 100644
--- a/FModel/Views/ImageMerger.xaml.cs
+++ b/FModel/Views/ImageMerger.xaml.cs
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
+using System.Windows.Input;
 using System.Windows.Media.Imaging;
 using AdonisUI.Controls;
 using FModel.Extensions;
@@ -30,6 +31,11 @@ namespace FModel.Views
             if (ImagePreview.Source != null)
                 await DrawPreview().ConfigureAwait(false);
         }
+        private async void Click_DrawPreview(object sender, MouseButtonEventArgs e)
+        {
+            if (ImagePreview.Source != null)
+                await DrawPreview().ConfigureAwait(false);        
+        }
 
         private async Task DrawPreview()
         {
@@ -267,5 +273,6 @@ namespace FModel.Views
         }
 
         private void OnCopyImage(object sender, RoutedEventArgs e) => Clipboard.SetImage((BitmapSource) ImagePreview.Source);
+        
     }
 }
\ No newline at end of file

From 39b8f02f161c0b438abb315b10461656aef514f8 Mon Sep 17 00:00:00 2001
From: GMatrixGames <gmatrixgames@hotmail.com>
Date: Mon, 24 May 2021 12:46:09 -0400
Subject: [PATCH 2/2] Revert preview drawing

---
 FModel/Creator/Bases/UCreator.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/FModel/Creator/Bases/UCreator.cs b/FModel/Creator/Bases/UCreator.cs
index 3c288df6..fb4e56ef 100644
--- a/FModel/Creator/Bases/UCreator.cs
+++ b/FModel/Creator/Bases/UCreator.cs
@@ -131,11 +131,7 @@ namespace FModel.Creator.Bases
         }
 
         protected void DrawPreview(SKCanvas c)
-        {
-            var i = Preview ?? DefaultPreview;
-            var x = i.Width < Width ? Width / 2 - i.Width / 2 : Margin;
-            c.DrawBitmap(i, new SKRect(x, Margin, x + i.Width - Margin * 2, i.Height - Margin), ImagePaint);
-        }
+            => c.DrawBitmap(Preview ?? DefaultPreview, new SKRect(Margin, Margin, Width - Margin, Height - Margin), ImagePaint);
 
         protected void DrawTextBackground(SKCanvas c)
         {
@@ -231,4 +227,4 @@ namespace FModel.Creator.Bases
             }
         }
     }
-}
\ No newline at end of file
+}