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

When processing image effects show wait cursor

Browse source
This commit is contained in:
Jaex 2018-05-09 02:10:38 +03:00
parent 696e9ff715
commit 1e70452e9f
3 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
ShareX.ImageEffectsLib/ImageEffectsForm.cs
View file

@ -60,7 +60,7 @@ public ImageEffectsForm(Image img, List<ImageEffectPreset> presets, int selected
AddAllEffectsToContextMenu();
}
public void ToolMode(Action<Image> imageProcessRequested)
public void EnableToolMode(Action<Image> imageProcessRequested)
{
ImageProcessRequested += imageProcessRequested;
pbResult.AllowDrop = true;
@ -206,23 +206,32 @@ private void UpdatePreview()
if (preset != null && DefaultImage != null)
{
Stopwatch timer = Stopwatch.StartNew();
Cursor = Cursors.WaitCursor;
using (Image preview = ApplyEffects())
try
{
if (preview != null)
Stopwatch timer = Stopwatch.StartNew();
using (Image preview = ApplyEffects())
{
pbResult.LoadImage(preview);
Text = string.Format("ShareX - " + Resources.ImageEffectsForm_UpdatePreview_Image_effects___Width___0___Height___1___Render_time___2__ms,
preview.Width, preview.Height, timer.ElapsedMilliseconds);
}
else
{
pbResult.Reset();
Text = string.Format("ShareX - " + Resources.ImageEffectsForm_UpdatePreview_Image_effects___Width___0___Height___1___Render_time___2__ms,
0, 0, timer.ElapsedMilliseconds);
if (preview != null)
{
pbResult.LoadImage(preview);
Text = string.Format("ShareX - " + Resources.ImageEffectsForm_UpdatePreview_Image_effects___Width___0___Height___1___Render_time___2__ms,
preview.Width, preview.Height, timer.ElapsedMilliseconds);
}
else
{
pbResult.Reset();
Text = string.Format("ShareX - " + Resources.ImageEffectsForm_UpdatePreview_Image_effects___Width___0___Height___1___Render_time___2__ms,
0, 0, timer.ElapsedMilliseconds);
}
}
}
finally
{
Cursor = Cursors.Default;
}
}
UpdateControlStates();

6
ShareX.ImageEffectsLib/ImageEffectsForm.resx
View file

@ -591,6 +591,9 @@
<data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="btnUploadImage.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
</data>
<data name="btnUploadImage.Location" type="System.Drawing.Point, System.Drawing">
<value>456, 504</value>
</data>
@ -621,6 +624,9 @@
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>64</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value>
</data>

2
ShareX/TaskHelpers.cs
View file

@ -980,7 +980,7 @@ public static void OpenImageEffects(TaskSettings taskSettings = null)
using (ImageEffectsForm imageEffectsForm = new ImageEffectsForm(img, taskSettings.ImageSettings.ImageEffectPresets,
taskSettings.ImageSettings.SelectedImageEffectPreset))
{
imageEffectsForm.ToolMode(x => UploadManager.RunImageTask(x, taskSettings));
imageEffectsForm.EnableToolMode(x => UploadManager.RunImageTask(x, taskSettings));
imageEffectsForm.ShowDialog();
//taskSettings.ImageSettings.SelectedImageEffectPreset = imageEffectsForm.SelectedPresetIndex;
}