CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-28 15:31:30 +12:00
Code Issues Projects Releases Packages Wiki Activity

Code refactoring

Browse source
This commit is contained in:
Jaex 2023-12-27 08:26:53 +03:00
parent 2c86f83ac0
commit 3be1ffeefa
4 changed files with 43 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
ShareX.ScreenCaptureLib/Helpers/ImageEditorHistory.cs
View file

@ -32,11 +32,10 @@ namespace ShareX.ScreenCaptureLib
{
internal class ImageEditorHistory : IDisposable
{
public bool HasMementos => mementoStack.Count > 0;
public bool CanUndo => undoMementoStack.Count > 0;
public bool CanRedo => redoMementoStack.Count > 0;
public bool HasRedoMementos => redoMementoStack.Count > 0;
private Stack<ImageEditorMemento> mementoStack = new Stack<ImageEditorMemento>();
private Stack<ImageEditorMemento> undoMementoStack = new Stack<ImageEditorMemento>();
private Stack<ImageEditorMemento> redoMementoStack = new Stack<ImageEditorMemento>();
private readonly ShapeManager shapeManager;
@ -45,9 +44,9 @@ public ImageEditorHistory(ShapeManager shapeManager)
this.shapeManager = shapeManager;
}
public void AddMemento(ImageEditorMemento memento)
private void AddMemento(ImageEditorMemento memento)
{
mementoStack.Push(memento);
undoMementoStack.Push(memento);
foreach (ImageEditorMemento redoMemento in redoMementoStack)
{
@ -59,47 +58,51 @@ public void AddMemento(ImageEditorMemento memento)
private ImageEditorMemento GetMementoFromCanvas()
{
Bitmap canvas = shapeManager.Form.Canvas;
Rectangle rectClone = new Rectangle(0, 0, canvas.Width, canvas.Height);
Bitmap currentCanvas = canvas.Clone(rectClone, canvas.PixelFormat);
List<BaseShape> shapes = shapeManager.Shapes.Select(x => x.Duplicate()).ToList();
Bitmap canvas = (Bitmap)shapeManager.Form.Canvas.Clone();
return new ImageEditorMemento(shapes, canvas);
}
return new ImageEditorMemento(shapes, currentCanvas);
private ImageEditorMemento GetMementoFromShapes()
{
List<BaseShape> shapes = shapeManager.Shapes.Select(x => x.Duplicate()).ToList();
return new ImageEditorMemento(shapes);
}
public void CreateCanvasMemento()
{
AddMemento(GetMementoFromCanvas());
ImageEditorMemento memento = GetMementoFromCanvas();
AddMemento(memento);
}
public void CreateShapesMemento()
{
List<BaseShape> shapes = shapeManager.Shapes.Select(x => x.Duplicate()).ToList();
AddMemento(new ImageEditorMemento(shapes));
ImageEditorMemento memento = GetMementoFromShapes();
AddMemento(memento);
}
public void Undo()
{
if (mementoStack.Count > 0)
if (CanUndo)
{
ImageEditorMemento redoMemento;
ImageEditorMemento memento = mementoStack.Pop();
ImageEditorMemento memento = undoMementoStack.Pop();
if (memento.Shapes != null)
{
if (memento.Canvas == null)
{
redoMemento = new ImageEditorMemento(shapeManager.Shapes.Select(x => x.Duplicate()).ToList());
redoMemento = GetMementoFromShapes();
redoMementoStack.Push(redoMemento);
shapeManager.RestoreState(memento.Shapes);
shapeManager.RestoreState(memento);
}
else
{
redoMemento = GetMementoFromCanvas();
redoMementoStack.Push(redoMemento);
shapeManager.RestoreState(memento.Shapes, memento.Canvas);
shapeManager.RestoreState(memento);
}
}
}
@ -107,7 +110,7 @@ public void Undo()
public void Redo()
{
if (redoMementoStack.Count > 0)
if (CanRedo)
{
ImageEditorMemento redoMemento = redoMementoStack.Pop();
@ -115,18 +118,17 @@ public void Redo()
{
if (redoMemento.Canvas == null)
{
List<BaseShape> shapes = shapeManager.Shapes.Select(x => x.Duplicate()).ToList();
ImageEditorMemento memento = new ImageEditorMemento(shapes);
mementoStack.Push(memento);
ImageEditorMemento memento = GetMementoFromShapes();
undoMementoStack.Push(memento);
shapeManager.RestoreState(redoMemento.Shapes);
shapeManager.RestoreState(redoMemento);
}
else
{
ImageEditorMemento memento = GetMementoFromCanvas();
mementoStack.Push(memento);
undoMementoStack.Push(memento);
shapeManager.RestoreState(redoMemento.Shapes, redoMemento.Canvas);
shapeManager.RestoreState(redoMemento);
}
}
}
@ -134,12 +136,12 @@ public void Redo()
public void Dispose()
{
foreach (ImageEditorMemento memento in mementoStack)
foreach (ImageEditorMemento memento in undoMementoStack)
{
memento.Dispose();
}
mementoStack.Clear();
undoMementoStack.Clear();
foreach (ImageEditorMemento redoMemento in redoMementoStack)
{

4
ShareX.ScreenCaptureLib/Helpers/ImageEditorMemento.cs
View file

@ -47,14 +47,14 @@ public ImageEditorMemento(List<BaseShape> shapes, Bitmap canvas)
public void Dispose()
{
Canvas?.Dispose();
foreach (BaseShape shape in Shapes)
{
shape.Dispose();
}
Shapes.Clear();
Canvas?.Dispose();
}
}
}

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

@ -1542,17 +1542,18 @@ public bool IsShapeIntersect()
return GetIntersectShape() != null;
}
public void RestoreState(List<BaseShape> shapes)
public void RestoreState(ImageEditorMemento memento)
{
Shapes = shapes;
UpdateMenu();
}
if (memento != null)
{
if (memento.Canvas != null)
{
UpdateCanvas(memento.Canvas);
}
public void RestoreState(List<BaseShape> shapes, Bitmap canvas)
{
UpdateCanvas(canvas);
Shapes = shapes;
UpdateMenu();
Shapes = memento.Shapes;
UpdateMenu();
}
}
public void MoveShapeBottom(BaseShape shape)

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

@ -1519,8 +1519,8 @@ private void UpdateMenu()
break;
}
tsmiUndo.Enabled = history.HasMementos;
tsmiRedo.Enabled = history.HasRedoMementos;
tsmiUndo.Enabled = history.CanUndo;
tsmiRedo.Enabled = history.CanRedo;
tsmiDeleteAll.Enabled = Shapes.Count > 0;
tsmiDuplicate.Enabled = tsmiDelete.Enabled = tsmiMoveTop.Enabled = tsmiMoveUp.Enabled = tsmiMoveDown.Enabled = tsmiMoveBottom.Enabled = CurrentShape != null;