mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-01 09:47:22 +13:00
Make sure preview is updated once
This commit is contained in:
parent
c5b5744cb9
commit
593c9aea27
1 changed files with 10 additions and 21 deletions
|
@ -47,8 +47,7 @@ public partial class ImageEffectsForm : Form
|
|||
public int SelectedPresetIndex { get; private set; }
|
||||
public string FilePath { get; private set; }
|
||||
|
||||
private bool ignorePresetsSelectedIndexChanged = false;
|
||||
private bool pauseUpdate = false;
|
||||
private bool pauseUpdate;
|
||||
|
||||
public ImageEffectsForm(Bitmap bmp, List<ImageEffectPreset> presets, int selectedPresetIndex)
|
||||
{
|
||||
|
@ -81,8 +80,6 @@ public ImageEffectsForm(Bitmap bmp, List<ImageEffectPreset> presets, int selecte
|
|||
|
||||
AddAllEffectsToContextMenu();
|
||||
LoadSettings();
|
||||
|
||||
pauseUpdate = false;
|
||||
}
|
||||
|
||||
public static ImageEffectsForm GetFormInstance(List<ImageEffectPreset> presets, int selectedPresetIndex)
|
||||
|
@ -238,10 +235,7 @@ private void AddPreset(ImageEffectPreset preset)
|
|||
Presets.Add(preset);
|
||||
ListViewItem lvi = new ListViewItem(preset.ToString());
|
||||
lvPresets.Items.Add(lvi);
|
||||
ignorePresetsSelectedIndexChanged = true;
|
||||
lvPresets.SelectLast();
|
||||
ignorePresetsSelectedIndexChanged = false;
|
||||
LoadPreset(preset);
|
||||
txtPresetName.Focus();
|
||||
}
|
||||
}
|
||||
|
@ -265,6 +259,8 @@ private void UpdatePreview()
|
|||
|
||||
if (PreviewImage != null)
|
||||
{
|
||||
//Debug.WriteLine("Updating preview...");
|
||||
|
||||
Stopwatch timer = Stopwatch.StartNew();
|
||||
|
||||
using (Image preview = ApplyEffects())
|
||||
|
@ -414,8 +410,6 @@ private void ClearFields()
|
|||
|
||||
private void AddEffect(ImageEffect imageEffect, ImageEffectPreset preset = null)
|
||||
{
|
||||
pauseUpdate = true;
|
||||
|
||||
ListViewItem lvi = new ListViewItem(imageEffect.GetType().GetDescription());
|
||||
lvi.Checked = imageEffect.Enabled;
|
||||
lvi.Tag = imageEffect;
|
||||
|
@ -442,14 +436,10 @@ private void AddEffect(ImageEffect imageEffect, ImageEffectPreset preset = null)
|
|||
|
||||
lvi.EnsureVisible();
|
||||
lvi.Selected = true;
|
||||
|
||||
pauseUpdate = false;
|
||||
}
|
||||
|
||||
private void LoadPreset(ImageEffectPreset preset)
|
||||
{
|
||||
pauseUpdate = true;
|
||||
|
||||
txtPresetName.Text = preset.Name;
|
||||
lvEffects.Items.Clear();
|
||||
pgSettings.SelectedObject = null;
|
||||
|
@ -459,8 +449,6 @@ private void LoadPreset(ImageEffectPreset preset)
|
|||
AddEffect(imageEffect);
|
||||
}
|
||||
|
||||
pauseUpdate = false;
|
||||
|
||||
UpdatePreview();
|
||||
}
|
||||
|
||||
|
@ -469,6 +457,9 @@ private void LoadPreset(ImageEffectPreset preset)
|
|||
private void ImageEffectsForm_Shown(object sender, EventArgs e)
|
||||
{
|
||||
this.ForceActivate();
|
||||
|
||||
pauseUpdate = false;
|
||||
UpdatePreview();
|
||||
}
|
||||
|
||||
private void btnPresetNew_Click(object sender, EventArgs e)
|
||||
|
@ -512,15 +503,13 @@ private void lvPresets_SelectedIndexChanged(object sender, EventArgs e)
|
|||
{
|
||||
SelectedPresetIndex = lvPresets.SelectedIndex;
|
||||
|
||||
if (!ignorePresetsSelectedIndexChanged)
|
||||
{
|
||||
ImageEffectPreset preset = GetSelectedPreset();
|
||||
|
||||
if (preset != null)
|
||||
{
|
||||
LoadPreset(preset);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void txtPresetName_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue