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

Pause editor form before opening dialogs

Browse source
This commit is contained in:
Jaex 2018-01-09 13:00:56 +03:00
parent 446965d4ce
commit d013b862ed
3 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ShareX.HelpersLib/Controls/ToolStripCheckedBoldRenderer.cs
View file

@ -47,10 +47,12 @@ protected override void OnRenderItemText(ToolStripItemTextRenderEventArgs e)
protected override void OnRenderArrow(ToolStripArrowRenderEventArgs e)
{
if(e.Item is ToolStripDropDownButton && ((ToolStripDropDownButton)e.Item).Owner is ToolStripBorderRight)
if (e.Item is ToolStripDropDownButton && ((ToolStripDropDownButton)e.Item).Owner is ToolStripBorderRight)
{
e.Direction = ArrowDirection.Right;
}
base.OnRenderArrow(e);
}
}
}

21
ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
View file

@ -1488,8 +1488,12 @@ public Image CropImage(Rectangle rect, bool onlyIfSizeDifferent = false)
public void NewImage()
{
Form.Pause();
Image img = NewImageForm.CreateNewImage(Options, Form);
Form.Resume();
if (img != null)
{
Form.ImageFilePath = "";
@ -1501,7 +1505,12 @@ public void NewImage()
private void OpenImageFile()
{
Form.Pause();
string filePath = ImageHelpers.OpenImageFileDialog(Form);
Form.Resume();
LoadImageFile(filePath);
}
@ -1523,8 +1532,12 @@ private void LoadImageFile(string filePath)
private void InsertImageFile()
{
Form.Pause();
string filePath = ImageHelpers.OpenImageFileDialog(Form);
Form.Resume();
if (!string.IsNullOrEmpty(filePath))
{
Image img = ImageHelpers.LoadImage(filePath);
@ -1572,6 +1585,8 @@ private void InsertImage(Image img, Point pos)
private void ChangeImageSize()
{
Form.Pause();
Size oldSize = Form.Canvas.Size;
using (ImageSizeForm imageSizeForm = new ImageSizeForm(oldSize, Options.ImageEditorResizeInterpolationMode))
@ -1593,6 +1608,8 @@ private void ChangeImageSize()
}
}
}
Form.Resume();
}
internal InterpolationMode GetInterpolationMode(ImageEditorInterpolationMode interpolationMode)
@ -1615,6 +1632,8 @@ internal InterpolationMode GetInterpolationMode(ImageEditorInterpolationMode int
private void ChangeCanvasSize()
{
Form.Pause();
using (CanvasSizeForm canvasSizeForm = new CanvasSizeForm())
{
if (canvasSizeForm.ShowDialog(Form) == DialogResult.OK)
@ -1629,6 +1648,8 @@ private void ChangeCanvasSize()
}
}
}
Form.Resume();
}
private void AddCropTool()

7
ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs
View file

@ -642,12 +642,7 @@ internal void CreateToolbar()
ToolStripMenuItem tsmiNewImage = new ToolStripMenuItem("New image...");
tsmiNewImage.Image = Resources.image_empty;
tsmiNewImage.Click += (sender, e) =>
{
Form.Pause();
NewImage();
Form.Resume();
};
tsmiNewImage.Click += (sender, e) => NewImage();
tsddbImage.DropDownItems.Add(tsmiNewImage);
ToolStripMenuItem tsmiOpenImage = new ToolStripMenuItem("Open image file...");