ShareX
/
ShareX
mirror of https://github.com/ShareX/ShareX.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed Image Beautifier issues

This commit is contained in:
Jaex 2024-03-08 07:50:52 +03:00
parent 36c38c5cc2
commit 92c290e5b1
4 changed files with 38 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ShareX.HelpersLib/Printer/PrintHelper.cs
View File

@ -158,7 +158,7 @@ namespace ShareX.HelpersLib
Image img;
if (Settings.AutoRotateImage && ((rect.Width > rect.Height && Image.Width < Image.Height) ||
(rect.Width < rect.Height && Image.Width > Image.Height)))
(rect.Width < rect.Height && Image.Width > Image.Height)))
{
img = (Image)Image.Clone();
img.RotateFlip(RotateFlipType.Rotate90FlipNone);

4
ShareX.MediaLib/Forms/ImageBeautifierForm.cs
View File

@ -241,12 +241,12 @@ namespace ShareX.MediaLib
private void OnUploadImageRequested()
{
UploadImageRequested?.Invoke(PreviewImage);
UploadImageRequested?.Invoke(PreviewImage.CloneSafe());
}
private void OnPrintImageRequested()
{
PrintImageRequested?.Invoke(PreviewImage);
PrintImageRequested?.Invoke(PreviewImage.CloneSafe());
}
private async void ImageBeautifierForm_Shown(object sender, EventArgs e)

2
ShareX/Forms/QRCodeForm.cs
View File

@ -286,7 +286,7 @@ namespace ShareX
if (pbQRCode.Image != null)
{
Bitmap bmp = (Bitmap)pbQRCode.Image.Clone();
UploadManager.UploadImage(bmp);
TaskHelpers.MainFormUploadImage(bmp);
}
}
}

88
ShareX/TaskHelpers.cs
View File

@ -1040,33 +1040,9 @@ namespace ShareX
return newFilePath;
};
form.CopyImageRequested += output =>
{
Program.MainForm.InvokeSafe(() =>
{
ClipboardHelpers.CopyImage(output);
});
};
form.UploadImageRequested += output =>
{
Program.MainForm.InvokeSafe(() =>
{
UploadManager.UploadImage(output, taskSettings);
});
};
form.PrintImageRequested += output =>
{
Program.MainForm.InvokeSafe(() =>
{
using (output)
{
PrintImage(output);
}
});
};
form.CopyImageRequested += MainFormCopyImage;
form.UploadImageRequested += output => MainFormUploadImage(output, taskSettings);
form.PrintImageRequested += MainFormPrintImage;
form.ShowDialog();
switch (form.Result)
@ -1088,6 +1064,33 @@ namespace ShareX
return null;
}
public static void MainFormCopyImage(Bitmap bmp)
{
Program.MainForm.InvokeSafe(() =>
{
ClipboardHelpers.CopyImage(bmp);
});
}
public static void MainFormUploadImage(Bitmap bmp, TaskSettings taskSettings = null)
{
Program.MainForm.InvokeSafe(() =>
{
UploadManager.UploadImage(bmp, taskSettings);
});
}
public static void MainFormPrintImage(Bitmap bmp)
{
Program.MainForm.InvokeSafe(() =>
{
using (bmp)
{
PrintImage(bmp);
}
});
}
public static void OpenImageBeautifier(TaskSettings taskSettings = null)
{
string filePath = ImageHelpers.OpenImageFileDialog();
@ -1102,20 +1105,8 @@ namespace ShareX
if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings();
ImageBeautifierForm imageBeautifierForm = new ImageBeautifierForm(filePath, taskSettings.ToolsSettingsReference.ImageBeautifierOptions);
imageBeautifierForm.UploadImageRequested += output =>
{
UploadManager.UploadImage(output, taskSettings);
};
imageBeautifierForm.PrintImageRequested += output =>
{
using (output)
{
PrintImage(output);
}
};
imageBeautifierForm.UploadImageRequested += output => MainFormUploadImage(output, taskSettings);
imageBeautifierForm.PrintImageRequested += MainFormPrintImage;
imageBeautifierForm.Show();
}
}
@ -1128,19 +1119,8 @@ namespace ShareX
using (ImageBeautifierForm imageBeautifierForm = new ImageBeautifierForm(bmp, taskSettings.ToolsSettingsReference.ImageBeautifierOptions))
{
imageBeautifierForm.UploadImageRequested += output =>
{
UploadManager.UploadImage(output, taskSettings);
};
imageBeautifierForm.PrintImageRequested += output =>
{
using (output)
{
PrintImage(output);
}
};
imageBeautifierForm.UploadImageRequested += output => MainFormUploadImage(output, taskSettings);
imageBeautifierForm.PrintImageRequested += MainFormPrintImage;
imageBeautifierForm.ShowDialog();
return (Bitmap)imageBeautifierForm.PreviewImage.Clone();