|
@@ -57,7 +57,7 @@ namespace PixiEditor.Models.Layers
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- public static Layer MergeWith(this Layer thisLayer, Layer otherLayer, string newName, Vector documentsSize)
|
|
|
+ public static Layer MergeWith(this Layer thisLayer, Layer otherLayer, string newName, PixelSize documentSize)
|
|
|
{
|
|
|
Int32Rect thisRect = new(thisLayer.OffsetX, thisLayer.OffsetY, thisLayer.Width, thisLayer.Height);
|
|
|
Int32Rect otherRect = new(otherLayer.OffsetX, otherLayer.OffsetY, otherLayer.Width, otherLayer.Height);
|
|
@@ -68,7 +68,9 @@ namespace PixiEditor.Models.Layers
|
|
|
|
|
|
Layer mergedLayer = new Layer(newName, mergedBitmap)
|
|
|
{
|
|
|
- Offset = new Thickness(combined.X, combined.Y, 0, 0)
|
|
|
+ Offset = new Thickness(combined.X, combined.Y, 0, 0),
|
|
|
+ MaxWidth = documentSize.Width,
|
|
|
+ MaxHeight = documentSize.Height
|
|
|
};
|
|
|
|
|
|
return mergedLayer;
|
|
@@ -76,7 +78,7 @@ namespace PixiEditor.Models.Layers
|
|
|
|
|
|
public static Layer MergeWith(this Layer thisLayer, Layer otherLayer, string newName, int documentWidth, int documentHeight)
|
|
|
{
|
|
|
- return MergeWith(thisLayer, otherLayer, newName, new Vector(documentWidth, documentHeight));
|
|
|
+ return MergeWith(thisLayer, otherLayer, newName, new PixelSize(documentWidth, documentHeight));
|
|
|
}
|
|
|
}
|
|
|
}
|