CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve:插入图片

Browse Source
This commit is contained in:
CJKmkp
2025-07-21 15:20:05 +08:00
parent 45e368d9e7
commit 32c77d3743
3 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow_cs/MW_BoardControls.cs
-1
View File
@@ -96,7 +96,6 @@ namespace Ink_Canvas {
InkCanvas.SetLeft(img, info.Left); InkCanvas.SetLeft(img, info.Left);
InkCanvas.SetTop(img, info.Top); InkCanvas.SetTop(img, info.Top);
inkCanvas.Children.Add(img); inkCanvas.Children.Add(img);
CenterAndScaleElement(img);
} }
} }
} }
Ink Canvas/MainWindow_cs/MW_ElementsControls.cs
+10 -27
View File
@@ -28,10 +28,17 @@ namespace Ink_Canvas
string timestamp = "img_" + DateTime.Now.ToString("yyyyMMdd_HH_mm_ss_fff"); string timestamp = "img_" + DateTime.Now.ToString("yyyyMMdd_HH_mm_ss_fff");
image.Name = timestamp; image.Name = timestamp;
CenterAndScaleElement(image); // 新缩放逻辑：最大宽高为画布一半，并居中
double maxWidth = inkCanvas.ActualWidth / 2;
double maxHeight = inkCanvas.ActualHeight / 2;
double scaleX = maxWidth / image.Width;
double scaleY = maxHeight / image.Height;
double scale = Math.Min(1, Math.Min(scaleX, scaleY));
image.Width = image.Width * scale;
image.Height = image.Height * scale;
InkCanvas.SetLeft(image, (inkCanvas.ActualWidth - image.Width) / 2);
InkCanvas.SetTop(image, (inkCanvas.ActualHeight - image.Height) / 2);
InkCanvas.SetLeft(image, 0);
InkCanvas.SetTop(image, 0);
inkCanvas.Children.Add(image); inkCanvas.Children.Add(image);
timeMachine.CommitElementInsertHistory(image); timeMachine.CommitElementInsertHistory(image);
@@ -105,8 +112,6 @@ namespace Ink_Canvas
if (mediaElement != null) if (mediaElement != null)
{ {
CenterAndScaleElement(mediaElement);
InkCanvas.SetLeft(mediaElement, 0); InkCanvas.SetLeft(mediaElement, 0);
InkCanvas.SetTop(mediaElement, 0); InkCanvas.SetTop(mediaElement, 0);
inkCanvas.Children.Add(mediaElement); inkCanvas.Children.Add(mediaElement);
@@ -155,27 +160,5 @@ namespace Ink_Canvas
}); });
} }
#endregion #endregion
private void CenterAndScaleElement(FrameworkElement element)
{
double maxWidth = SystemParameters.PrimaryScreenWidth / 2;
double maxHeight = SystemParameters.PrimaryScreenHeight / 2;
double scaleX = maxWidth / element.Width;
double scaleY = maxHeight / element.Height;
double scale = Math.Min(scaleX, scaleY);
TransformGroup transformGroup = new TransformGroup();
transformGroup.Children.Add(new ScaleTransform(scale, scale));
double canvasWidth = inkCanvas.ActualWidth;
double canvasHeight = inkCanvas.ActualHeight;
double centerX = (canvasWidth - element.Width * scale) / 2;
double centerY = (canvasHeight - element.Height * scale) / 2;
transformGroup.Children.Add(new TranslateTransform(centerX, centerY));
element.RenderTransform = transformGroup;
}
} }
} }
Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
+10 -3
View File
@@ -2004,10 +2004,17 @@ namespace Ink_Canvas {
string timestamp = "img_" + DateTime.Now.ToString("yyyyMMdd_HH_mm_ss_fff"); string timestamp = "img_" + DateTime.Now.ToString("yyyyMMdd_HH_mm_ss_fff");
image.Name = timestamp; image.Name = timestamp;
CenterAndScaleElement(image); // 新缩放逻辑：最大宽高为画布一半，并居中
double maxWidth = inkCanvas.ActualWidth / 2;
double maxHeight = inkCanvas.ActualHeight / 2;
double scaleX = maxWidth / image.Width;
double scaleY = maxHeight / image.Height;
double scale = Math.Min(1, Math.Min(scaleX, scaleY));
image.Width = image.Width * scale;
image.Height = image.Height * scale;
InkCanvas.SetLeft(image, (inkCanvas.ActualWidth - image.Width) / 2);
InkCanvas.SetTop(image, (inkCanvas.ActualHeight - image.Height) / 2);
InkCanvas.SetLeft(image, 0);
InkCanvas.SetTop(image, 0);
inkCanvas.Children.Add(image); inkCanvas.Children.Add(image);
timeMachine.CommitElementInsertHistory(image); timeMachine.CommitElementInsertHistory(image);