CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-30 01:07:21 +13:00
Code Issues Projects Releases Packages Wiki Activity

Code refactor

Browse source
This commit is contained in:
Jaex 2020-11-26 16:39:30 +03:00
parent fe381da2c1
commit 57d3cb9de5
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ShareX.HelpersLib/Forms/ImageViewer.cs
View file

@ -31,11 +31,11 @@ namespace ShareX.HelpersLib
{
public class ImageViewer : Form
{
private Image screenshot;
private Image image;
private ImageViewer(Image image)
private ImageViewer(Image img)
{
screenshot = image;
image = img;
InitializeComponent();
ShareXResources.ApplyTheme(this);
@ -45,10 +45,15 @@ public static void ShowImage(Image img)
{
if (img != null)
{
using (Image tempImage = (Image)img.Clone())
using (ImageViewer viewer = new ImageViewer(tempImage))
using (Image tempImage = img.CloneSafe())
{
viewer.ShowDialog();
if (tempImage != null)
{
using (ImageViewer viewer = new ImageViewer(tempImage))
{
viewer.ShowDialog();
}
}
}
}
}
@ -108,9 +113,9 @@ protected override void Dispose(bool disposing)
components.Dispose();
}
if (screenshot != null)
if (image != null)
{
screenshot.Dispose();
image.Dispose();
}
base.Dispose(disposing);
@ -135,19 +140,19 @@ private void InitializeComponent()
StartPosition = FormStartPosition.Manual;
pbPreview.Cursor = Cursors.Hand;
pbPreview.Dock = System.Windows.Forms.DockStyle.Fill;
pbPreview.Dock = DockStyle.Fill;
pbPreview.DrawCheckeredBackground = true;
pbPreview.FullscreenOnClick = false;
pbPreview.Location = new System.Drawing.Point(0, 0);
pbPreview.Location = new Point(0, 0);
pbPreview.Name = "pbPreview";
pbPreview.ShowImageSizeLabel = true;
pbPreview.Size = new System.Drawing.Size(96, 100);
pbPreview.Size = new Size(96, 100);
pbPreview.TabIndex = 0;
pbPreview.LoadImage(screenshot);
pbPreview.LoadImage(image);
Controls.Add(pbPreview);
Shown += new System.EventHandler(ShowScreenshot_Shown);
Deactivate += new System.EventHandler(ShowScreenshot_Deactivate);
Shown += new EventHandler(ShowScreenshot_Shown);
Deactivate += new EventHandler(ShowScreenshot_Deactivate);
pbPreview.MouseDown += pbPreview_MouseDown;
pbPreview.KeyDown += pbPreview_KeyDown;