fix cropping images not correctly setting new width and height to dat g1 element

Author: LeftofZen

Gui/ViewModels/Graphics/ImageTableViewModel.cs

@@ -199,7 +199,7 @@ private void RecreateViewModelGroupsFromImageTable(ImageTable imageTable)
 		GroupedImageViewModels.Clear();
 		foreach (var group in imageTable.Groups)
 		{
-			var givm = new GroupedImageViewModel(group.Name, group.GraphicsElements.Select(ge => new ImageViewModel(ge)));
+			var givm = new GroupedImageViewModel(group.Name, group.GraphicsElements.Select(ge => new ImageViewModel(ge, Model.PaletteMap)));
 			givm.SelectionModel.SelectionChanged += SelectionChanged;
 			GroupedImageViewModels.Add(givm);
 		}

Gui/ViewModels/Graphics/ImageViewModel.cs

@@ -100,18 +100,25 @@ public Avalonia.Rect SelectedBitmapPreviewBorder
 
 	GraphicsElement Model { get; init; }
 
-	public ImageViewModel(GraphicsElement graphicsElement)
+	public ImageViewModel(GraphicsElement graphicsElement, PaletteMap paletteMap)
 	{
 		Model = graphicsElement;
+		UnderlyingImage = Model.Image!;
 
 		_ = this.WhenAnyValue(o => o.UnderlyingImage)
 			.Where(x => x != null)
-			.Subscribe(_ => DisplayedImage = UnderlyingImage!.ToAvaloniaBitmap());
-
-		_ = this.WhenAnyValue(o => o.DisplayedImage)
+			.Subscribe(_ =>
+		{
+			DisplayedImage = UnderlyingImage!.ToAvaloniaBitmap();
+			this.RaisePropertyChanged(nameof(Width));
+			this.RaisePropertyChanged(nameof(Height));
+			Model.ImageData = paletteMap.ConvertRgba32ImageToG1Data(UnderlyingImage, Flags);
+			Model.Width = (short)UnderlyingImage.Width;
+			Model.Height = (short)UnderlyingImage.Height;
+		});
+
+		_ = this.WhenAnyValue(o => o.DisplayedImage, o => o.XOffset, o => o.YOffset, o => o.Width, o => o.Height)
 			.Subscribe(_ => this.RaisePropertyChanged(nameof(SelectedBitmapPreviewBorder)));
-
-		UnderlyingImage = Model.Image!;
 	}
 
 	public void RecolourImage(ColourSwatch primary, ColourSwatch secondary, PaletteMap paletteMap)
@@ -147,19 +154,17 @@ public void CropImage()
 
 		if (cropRegion.Width <= 0 || cropRegion.Height <= 0)
 		{
-			UnderlyingImage.Mutate(i => i.Crop(new Rectangle(0, 0, 1, 1)));
+			UnderlyingImage = UnderlyingImage.Clone(i => i.Crop(new Rectangle(0, 0, 1, 1)));
 			XOffset = 0;
 			YOffset = 0;
 		}
 		else
 		{
-			UnderlyingImage.Mutate(i => i.Crop(cropRegion));
+			UnderlyingImage = UnderlyingImage.Clone(i => i.Crop(cropRegion));
 			XOffset += (short)cropRegion.Left;
 			YOffset += (short)cropRegion.Top;
 		}
 
-		this.RaisePropertyChanged(nameof(UnderlyingImage));
-
 		static Rectangle FindCropRegion(Image<Rgba32> image)
 		{
 			var minX = image.Width;