Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-03-22 01:34:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
GMatrixGames 2021-05-24 16:15:11 -04:00
commit eecc708cba
No known key found for this signature in database
GPG Key ID: 2621164AAF16CEDF
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
FModel/Creator/Bases/UCreator.cs
View File

@ -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
}
}
}
}
}

4
FModel/Views/ImageMerger.xaml
View File

@ -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"/>

7
FModel/Views/ImageMerger.xaml.cs
View File

@ -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);
}
}