CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 17:56:51 +13:00
Code Issues Projects Releases Packages Wiki Activity

Don't need to store image and file path inside class

Browse source
This commit is contained in:
Jaex 2019-05-22 10:24:57 +03:00
parent 0c6b3b7b25
commit d3c0e3a824
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ShareX/Controls/TaskPanel.cs
View file

@ -88,9 +88,7 @@ public bool ProgressVisible
private bool progressVisible;
public Image ThumbnailImage { get; private set; }
public Size ThumbnailSize { get; private set; }
public string ThumbnailSourceFilePath { get; private set; }
private Rectangle dragBoxFromMouseDown;
@ -175,10 +173,7 @@ public void UpdateThumbnail()
{
if (img != null)
{
//ThumbnailImage = ImageHelpers.CreateThumbnail(img, ThumbnailSize.Width, ThumbnailSize.Height);
ThumbnailImage = ImageHelpers.ResizeImage(img, ThumbnailSize, false);
pbThumbnail.Image = ThumbnailImage;
ThumbnailSourceFilePath = filePath;
pbThumbnail.Image = ImageHelpers.ResizeImage(img, ThumbnailSize, false);
pbThumbnail.Cursor = pThumbnail.Cursor = Cursors.Hand;
return;
}
@ -190,8 +185,7 @@ public void UpdateThumbnail()
using (Icon icon = NativeMethods.GetJumboFileIcon(filePath, false))
using (Image img = icon.ToBitmap())
{
ThumbnailImage = ImageHelpers.ResizeImage(img, ThumbnailSize, false, true);
pbThumbnail.Image = ThumbnailImage;
pbThumbnail.Image = ImageHelpers.ResizeImage(img, ThumbnailSize, false, true);
pbThumbnail.Cursor = pThumbnail.Cursor = Cursors.Default;
}
}
@ -213,15 +207,13 @@ public void UpdateProgress()
public void ClearThumbnail()
{
Image temp = pbThumbnail.Image;
pbThumbnail.Image = null;
if (ThumbnailImage != null)
if (temp != null && temp != pbThumbnail.ErrorImage && temp != pbThumbnail.InitialImage)
{
ThumbnailImage.Dispose();
ThumbnailImage = null;
temp.Dispose();
}
ThumbnailSourceFilePath = null;
}
private void PbThumbnail_MouseDown(object sender, MouseEventArgs e)
@ -240,11 +232,18 @@ private void PbThumbnail_MouseUp(object sender, MouseEventArgs e)
private void PbThumbnail_MouseClick(object sender, MouseEventArgs e)
{
if (e.Button == MouseButtons.Left && !string.IsNullOrEmpty(ThumbnailSourceFilePath))
if (e.Button == MouseButtons.Left && Task.Info != null && !string.IsNullOrEmpty(Task.Info.FilePath) && File.Exists(Task.Info.FilePath))
{
pbThumbnail.Enabled = false;
ImageViewer.ShowImage(ThumbnailSourceFilePath);
pbThumbnail.Enabled = true;
try
{
ImageViewer.ShowImage(Task.Info.FilePath);
}
finally
{
pbThumbnail.Enabled = true;
}
}
}