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

Make sure to not update toolbar when ShareX closing

Browse source
This commit is contained in:
Jaex 2017-10-30 11:48:58 +03:00
parent 0c30cb832f
commit 8f97e5896e
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs
View file

@ -27,7 +27,6 @@ You should have received a copy of the GNU General Public License
using ShareX.ScreenCaptureLib.Properties;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
using System.Drawing.Drawing2D;
@ -381,8 +380,6 @@ private void RegionCaptureForm_LocationChanged(object sender, EventArgs e)
private void RegionCaptureForm_FormClosing(object sender, FormClosingEventArgs e)
{
IsClosing = true;
if (IsEditorMode && Config.EditorModeRememberWindowState)
{
Config.EditorModeWindowState.UpdateFormState(this);
@ -1360,6 +1357,8 @@ private Image GetOutputImage()
protected override void Dispose(bool disposing)
{
IsClosing = true;
ShapeManager?.Dispose();
bmpBackgroundImage?.Dispose();
backgroundBrush?.Dispose();

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

@ -36,7 +36,7 @@ namespace ShareX.ScreenCaptureLib
internal partial class ShapeManager
{
public bool ToolbarCreated { get; private set; }
public bool IsMenuCollapsed { get; private set; }
public bool ToolbarCollapsed { get; private set; }
internal TextAnimation MenuTextAnimation = new TextAnimation()
{
@ -952,7 +952,7 @@ private void TslDrag_MouseDown(object sender, MouseEventArgs e)
}
else if (e.Button == MouseButtons.Right)
{
SetMenuCollapsed(!IsMenuCollapsed);
SetMenuCollapsed(!ToolbarCollapsed);
CheckMenuPosition();
}
}
@ -1038,14 +1038,14 @@ private void CheckMenuPosition()
private void SetMenuCollapsed(bool isCollapsed)
{
if (IsMenuCollapsed == isCollapsed)
if (ToolbarCollapsed == isCollapsed)
{
return;
}
IsMenuCollapsed = isCollapsed;
ToolbarCollapsed = isCollapsed;
if (IsMenuCollapsed)
if (ToolbarCollapsed)
{
foreach (ToolStripItem tsi in tsMain.Items.OfType<ToolStripItem>())
{
@ -1069,7 +1069,7 @@ private void SetMenuCollapsed(bool isCollapsed)
if (!form.IsEditorMode && Config.RememberMenuState)
{
Config.MenuCollapsed = IsMenuCollapsed;
Config.MenuCollapsed = ToolbarCollapsed;
}
}