From 8bc6fbdcc4373ac5fbd8a7c4b0e85c525a307c88 Mon Sep 17 00:00:00 2001 From: Robin Krom Date: Fri, 4 Mar 2022 23:04:14 +0100 Subject: [PATCH] Small code cleanup of the places I already touched in this PR. --- .../Drawing/DrawableContainerList.cs | 22 +- src/Greenshot.Editor/Drawing/Surface.cs | 308 +++++++++--------- .../Memento/AddElementMemento.cs | 2 +- .../Memento/AddElementsMemento.cs | 2 +- .../Memento/ChangeFieldHolderMemento.cs | 2 +- .../Memento/DeleteElementMemento.cs | 2 +- .../Memento/DeleteElementsMemento.cs | 2 +- .../DrawableContainerBoundsChangeMemento.cs | 26 +- .../Memento/SurfaceBackgroundChangeMemento.cs | 2 +- .../Memento/TextChangeMemento.cs | 2 +- 10 files changed, 175 insertions(+), 195 deletions(-) diff --git a/src/Greenshot.Editor/Drawing/DrawableContainerList.cs b/src/Greenshot.Editor/Drawing/DrawableContainerList.cs index 1a31de881..9ab825e4a 100644 --- a/src/Greenshot.Editor/Drawing/DrawableContainerList.cs +++ b/src/Greenshot.Editor/Drawing/DrawableContainerList.cs @@ -136,7 +136,7 @@ namespace Greenshot.Editor.Drawing } /// - /// Make a following bounds change on this containerlist undoable! + /// Make a following bounds change on this DrawableContainerList undoable! /// /// true means allow the moves to be merged public void MakeBoundsChangeUndoable(bool allowMerge) @@ -301,16 +301,14 @@ namespace Greenshot.Editor.Drawing { return Rectangle.Empty; } - else - { - var result = this[0].DrawingBounds; - for (int i = 1; i < Count; i++) - { - result = Rectangle.Union(result, this[i].DrawingBounds); - } - return result; + var result = this[0].DrawingBounds; + for (int i = 1; i < Count; i++) + { + result = Rectangle.Union(result, this[i].DrawingBounds); } + + return result; } } @@ -319,7 +317,7 @@ namespace Greenshot.Editor.Drawing /// /// the to the bitmap related Graphics object /// Bitmap to draw - /// the rendermode in which the element is to be drawn + /// the RenderMode in which the element is to be drawn /// public void Draw(Graphics g, Bitmap bitmap, RenderMode renderMode, Rectangle clipRectangle) { @@ -584,9 +582,7 @@ namespace Greenshot.Editor.Drawing return; } - var dc = this[index1]; - this[index1] = this[index2]; - this[index2] = dc; + (this[index1], this[index2]) = (this[index2], this[index1]); Parent.Modified = true; } diff --git a/src/Greenshot.Editor/Drawing/Surface.cs b/src/Greenshot.Editor/Drawing/Surface.cs index c6b5ffe5b..a82daa6f3 100644 --- a/src/Greenshot.Editor/Drawing/Surface.cs +++ b/src/Greenshot.Editor/Drawing/Surface.cs @@ -711,7 +711,7 @@ namespace Greenshot.Editor.Drawing BinaryFormatter binaryRead = new BinaryFormatter(); IDrawableContainerList loadedElements = (IDrawableContainerList) binaryRead.Deserialize(streamRead); loadedElements.Parent = this; - // Make sure the steplabels are sorted accoring to their number + // Make sure the steplabels are sorted according to their number _stepLabels.Sort((p1, p2) => p1.Number.CompareTo(p2.Number)); DeselectAllElements(); AddElements(loadedElements); @@ -1119,16 +1119,15 @@ namespace Greenshot.Editor.Drawing /// Message itself public void SendMessageEvent(object source, SurfaceMessageTyp messageType, string message) { - if (_surfaceMessage != null) + if (_surfaceMessage == null) return; + + var eventArgs = new SurfaceMessageEventArgs { - var eventArgs = new SurfaceMessageEventArgs - { - Message = message, - MessageType = messageType, - Surface = this - }; - _surfaceMessage(source, eventArgs); - } + Message = message, + MessageType = messageType, + Surface = this + }; + _surfaceMessage(source, eventArgs); } /// @@ -1136,16 +1135,15 @@ namespace Greenshot.Editor.Drawing /// /// Who send /// new color - public void UpdateForegroundColorEvent(object source, Color color) + private void UpdateForegroundColorEvent(object source, Color color) { - if (_foregroundColorChanged != null) + if (_foregroundColorChanged == null) return; + + var eventArgs = new SurfaceForegroundColorEventArgs { - var eventArgs = new SurfaceForegroundColorEventArgs - { - Color = color, - }; - _foregroundColorChanged(source, eventArgs); - } + Color = color, + }; + _foregroundColorChanged(source, eventArgs); } /// @@ -1153,16 +1151,15 @@ namespace Greenshot.Editor.Drawing /// /// Who send /// new color - public void UpdateBackgroundColorEvent(object source, Color color) + private void UpdateBackgroundColorEvent(object source, Color color) { - if (_lineThicknessChanged != null) + if (_lineThicknessChanged == null) return; + + var eventArgs = new SurfaceBackgroundColorEventArgs { - var eventArgs = new SurfaceBackgroundColorEventArgs - { - Color = color, - }; - _backgroundColorChanged(source, eventArgs); - } + Color = color, + }; + _backgroundColorChanged(source, eventArgs); } /// @@ -1170,16 +1167,15 @@ namespace Greenshot.Editor.Drawing /// /// Who send /// new thickness - public void UpdateLineThicknessEvent(object source, int thickness) + private void UpdateLineThicknessEvent(object source, int thickness) { - if (_lineThicknessChanged != null) + if (_lineThicknessChanged == null) return; + + var eventArgs = new SurfaceLineThicknessEventArgs { - var eventArgs = new SurfaceLineThicknessEventArgs - { - Thickness = thickness, - }; - _lineThicknessChanged(source, eventArgs); - } + Thickness = thickness, + }; + _lineThicknessChanged(source, eventArgs); } /// @@ -1187,23 +1183,22 @@ namespace Greenshot.Editor.Drawing /// /// Who send /// has shadow - public void UpdateShadowEvent(object source, bool hasShadow) + private void UpdateShadowEvent(object source, bool hasShadow) { - if (_shadowChanged != null) - { - var eventArgs = new SurfaceShadowEventArgs - { - HasShadow = hasShadow, - }; - _shadowChanged(source, eventArgs); - } + if (_shadowChanged == null) return; + + var eventArgs = new SurfaceShadowEventArgs + { + HasShadow = hasShadow, + }; + _shadowChanged(source, eventArgs); } /// /// Crop the surface /// /// rectangle that remains - /// + /// bool public bool ApplyCrop(Rectangle cropRectangle) { if (!IsCropPossible(ref cropRectangle, CropContainer.CropModes.Default)) return false; @@ -1224,7 +1219,7 @@ namespace Greenshot.Editor.Drawing throw; } - Matrix matrix = new Matrix(); + var matrix = new Matrix(); matrix.Translate(-cropRectangle.Left, -cropRectangle.Top, MatrixOrder.Append); // Make undoable MakeUndoable(new SurfaceBackgroundChangeMemento(this, matrix), false); @@ -1246,8 +1241,8 @@ namespace Greenshot.Editor.Drawing /// Splits the image in 3 parts(top, middle, bottom). Crop out the middle and joins top and bottom. /// /// rectangle of the middle part - /// - public bool ApplyHorizontalCrop(Rectangle cropRectangle) + /// bool + private bool ApplyHorizontalCrop(Rectangle cropRectangle) { if (!IsCropPossible(ref cropRectangle, CropContainer.CropModes.Horizontal)) return false; @@ -1255,12 +1250,12 @@ namespace Greenshot.Editor.Drawing var topRectangle = new Rectangle(0, 0, Image.Size.Width, cropRectangle.Top); var bottomRectangle = new Rectangle(0, cropRectangle.Top + cropRectangle.Height, Image.Size.Width, Image.Size.Height - cropRectangle.Top - cropRectangle.Height); - Bitmap tmpNewimage; - List imageParts = new List(); + Bitmap newImage; + var imageParts = new List(); // Make sure we have information, this this fails try { - tmpNewimage = new Bitmap(Image.Size.Width, Image.Size.Height - cropRectangle.Height); + newImage = new Bitmap(Image.Size.Width, Image.Size.Height - cropRectangle.Height); if (topRectangle.Height > 0) { @@ -1280,7 +1275,7 @@ namespace Greenshot.Editor.Drawing ex.Data.Add("Pixelformat", Image.PixelFormat); throw; } - using Graphics g = Graphics.FromImage(tmpNewimage); + using Graphics g = Graphics.FromImage(newImage); var insertPositionTop = 0; foreach (var image in imageParts) @@ -1290,16 +1285,16 @@ namespace Greenshot.Editor.Drawing image.Dispose(); } - Matrix matrix = new Matrix(); + var matrix = new Matrix(); matrix.Translate(0, -(cropRectangle.Top + cropRectangle.Height), MatrixOrder.Append); // Make undoable MakeUndoable(new SurfaceBackgroundChangeMemento(this, matrix), false); // Do not dispose otherwise we can't undo the image! - SetImage(tmpNewimage, false); + SetImage(newImage, false); _elements.Transform(matrix); - if (_surfaceSizeChanged != null && !imageRectangle.Equals(new Rectangle(Point.Empty, tmpNewimage.Size))) + if (_surfaceSizeChanged != null && !imageRectangle.Equals(new Rectangle(Point.Empty, newImage.Size))) { _surfaceSizeChanged(this, null); } @@ -1313,20 +1308,20 @@ namespace Greenshot.Editor.Drawing /// Splits the image in 3 parts(left, middle, right). Crop out the middle and joins top and bottom. /// /// rectangle of the middle part - /// - public bool ApplyVerticalCrop(Rectangle cropRectangle) + /// bool + private bool ApplyVerticalCrop(Rectangle cropRectangle) { if (!IsCropPossible(ref cropRectangle, CropContainer.CropModes.Vertical)) return false; var imageRectangle = new Rectangle(Point.Empty, Image.Size); var leftRectangle = new Rectangle(0, 0, cropRectangle.Left, Image.Size.Height); var rightRectangle = new Rectangle(cropRectangle.Left + cropRectangle.Width, 0, Image.Size.Width - cropRectangle.Width - cropRectangle.Left, Image.Size.Height); - Bitmap tmpNewimage; - List imageParts = new List(); + Bitmap newImage; + var imageParts = new List(); // Make sure we have information, this this fails try { - tmpNewimage = new Bitmap(Image.Size.Width - cropRectangle.Width, Image.Size.Height); + newImage = new Bitmap(Image.Size.Width - cropRectangle.Width, Image.Size.Height); if (leftRectangle.Width > 0) { @@ -1346,7 +1341,7 @@ namespace Greenshot.Editor.Drawing ex.Data.Add("Pixelformat", Image.PixelFormat); throw; } - using Graphics g = Graphics.FromImage(tmpNewimage); + using Graphics g = Graphics.FromImage(newImage); var insertPositionLeft = 0; foreach (var image in imageParts) @@ -1355,18 +1350,17 @@ namespace Greenshot.Editor.Drawing insertPositionLeft += image.Width; image.Dispose(); } - - Matrix matrix = new Matrix(); + var matrix = new Matrix(); matrix.Translate(-cropRectangle.Left - cropRectangle.Width, 0, MatrixOrder.Append); // Make undoable MakeUndoable(new SurfaceBackgroundChangeMemento(this, matrix), false); // Do not dispose otherwise we can't undo the image! - SetImage(tmpNewimage, false); + SetImage(newImage, false); _elements.Transform(matrix); - if (_surfaceSizeChanged != null && !imageRectangle.Equals(new Rectangle(Point.Empty, tmpNewimage.Size))) + if (_surfaceSizeChanged != null && !imageRectangle.Equals(new Rectangle(Point.Empty, newImage.Size))) { _surfaceSizeChanged(this, null); } @@ -1404,15 +1398,14 @@ namespace Greenshot.Editor.Drawing { foreach (IAdorner adorner in drawableContainer.Adorners) { - if (adorner.IsActive || adorner.HitTest(mouseEventArgs.Location)) + if (!adorner.IsActive && !adorner.HitTest(mouseEventArgs.Location)) continue; + + if (adorner.Cursor != null) { - if (adorner.Cursor != null) - { - Cursor = adorner.Cursor; - } - - return adorner; + Cursor = adorner.Cursor; } + + return adorner; } } @@ -1643,48 +1636,47 @@ namespace Greenshot.Editor.Drawing Cursor = DrawingMode != DrawingModes.None ? Cursors.Cross : Cursors.Default; - if (_mouseDown) + if (!_mouseDown) return; + + if (_mouseDownElement != null) { - if (_mouseDownElement != null) + // an element is currently dragged + _mouseDownElement.Invalidate(); + selectedElements.Invalidate(); + // Move the element + if (_mouseDownElement.Selected) { - // an element is currently dragged - _mouseDownElement.Invalidate(); - selectedElements.Invalidate(); - // Move the element - if (_mouseDownElement.Selected) + if (!_isSurfaceMoveMadeUndoable) { - if (!_isSurfaceMoveMadeUndoable) - { - // Only allow one undoable per mouse-down/move/up "cycle" - _isSurfaceMoveMadeUndoable = true; - selectedElements.MakeBoundsChangeUndoable(false); - } - - // dragged element has been selected before -> move all - selectedElements.MoveBy(currentMouse.X - _mouseStart.X, currentMouse.Y - _mouseStart.Y); - } - else - { - if (!_isSurfaceMoveMadeUndoable) - { - // Only allow one undoable per mouse-down/move/up "cycle" - _isSurfaceMoveMadeUndoable = true; - _mouseDownElement.MakeBoundsChangeUndoable(false); - } - - // dragged element is not among selected elements -> just move dragged one - _mouseDownElement.MoveBy(currentMouse.X - _mouseStart.X, currentMouse.Y - _mouseStart.Y); + // Only allow one undoable per mouse-down/move/up "cycle" + _isSurfaceMoveMadeUndoable = true; + selectedElements.MakeBoundsChangeUndoable(false); } - _mouseStart = currentMouse; - _mouseDownElement.Invalidate(); - _modified = true; + // dragged element has been selected before -> move all + selectedElements.MoveBy(currentMouse.X - _mouseStart.X, currentMouse.Y - _mouseStart.Y); } - else if (_drawingElement != null) + else { - _drawingElement.HandleMouseMove(currentMouse.X, currentMouse.Y); - _modified = true; + if (!_isSurfaceMoveMadeUndoable) + { + // Only allow one undoable per mouse-down/move/up "cycle" + _isSurfaceMoveMadeUndoable = true; + _mouseDownElement.MakeBoundsChangeUndoable(false); + } + + // dragged element is not among selected elements -> just move dragged one + _mouseDownElement.MoveBy(currentMouse.X - _mouseStart.X, currentMouse.Y - _mouseStart.Y); } + + _mouseStart = currentMouse; + _mouseDownElement.Invalidate(); + _modified = true; + } + else if (_drawingElement != null) + { + _drawingElement.HandleMouseMove(currentMouse.X, currentMouse.Y); + _modified = true; } } @@ -2018,7 +2010,7 @@ namespace Greenshot.Editor.Drawing Invalidate(); } - if (makeUndoable && elementToRemove.IsUndoable) + if (makeUndoable && elementToRemove is { IsUndoable: true }) { MakeUndoable(new DeleteElementMemento(this, elementToRemove), false); } @@ -2085,11 +2077,9 @@ namespace Greenshot.Editor.Drawing /// public void CutSelectedElements() { - if (HasSelectedElements) - { - ClipboardHelper.SetClipboardData(typeof(IDrawableContainerList), selectedElements); - RemoveSelectedElements(); - } + if (!HasSelectedElements) return; + ClipboardHelper.SetClipboardData(typeof(IDrawableContainerList), selectedElements); + RemoveSelectedElements(); } /// @@ -2097,61 +2087,57 @@ namespace Greenshot.Editor.Drawing /// public void CopySelectedElements() { - if (HasSelectedElements) - { - ClipboardHelper.SetClipboardData(typeof(IDrawableContainerList), selectedElements); - } + if (!HasSelectedElements) return; + ClipboardHelper.SetClipboardData(typeof(IDrawableContainerList), selectedElements); } /// /// This method is called to confirm/cancel "confirmable" elements, like the crop-container. /// Called when pressing enter or using the "check" in the editor. /// - /// + /// bool public void ConfirmSelectedConfirmableElements(bool confirm) { // create new collection so that we can iterate safely (selectedElements might change due with confirm/cancel) List selectedDCs = new List(selectedElements); foreach (IDrawableContainer dc in selectedDCs) { - if (dc.Equals(_cropContainer)) + if (!dc.Equals(_cropContainer)) continue; + DrawingMode = DrawingModes.None; + // No undo memento for the cropcontainer itself, only for the effect + RemoveElement(_cropContainer, false); + if (confirm) { - DrawingMode = DrawingModes.None; - // No undo memento for the cropcontainer itself, only for the effect - RemoveElement(_cropContainer, false); - if (confirm) + if (dc is CropContainer e) { - if (dc is CropContainer e) + switch (e.GetFieldValue(FieldType.CROPMODE)) { - switch (e.GetFieldValue(FieldType.CROPMODE)) + case CropContainer.CropModes.Horizontal: { - case CropContainer.CropModes.Horizontal: - { - ApplyHorizontalCrop(_cropContainer.Bounds); - break; - } - case CropContainer.CropModes.Vertical: - { - ApplyVerticalCrop(_cropContainer.Bounds); - break; - } - default: - { - ApplyCrop(_cropContainer.Bounds); - break; - } + ApplyHorizontalCrop(_cropContainer.Bounds); + break; + } + case CropContainer.CropModes.Vertical: + { + ApplyVerticalCrop(_cropContainer.Bounds); + break; + } + default: + { + ApplyCrop(_cropContainer.Bounds); + break; } } - else - { - ApplyCrop(_cropContainer.Bounds); - } } - - _cropContainer.Dispose(); - _cropContainer = null; - break; + else + { + ApplyCrop(_cropContainer.Bounds); + } } + + _cropContainer.Dispose(); + _cropContainer = null; + break; } } @@ -2337,13 +2323,13 @@ namespace Greenshot.Editor.Drawing /// /// Get the rectangle bounding all selected elements (in surface coordinates space), - /// or empty rectangle if nothing is selcted. + /// or empty rectangle if nothing is selected. /// public Rectangle GetSelectionRectangle() => ToSurfaceCoordinates(selectedElements.DrawingBounds); /// - /// Duplicate all the selecteded elements + /// Duplicate all the selected elements /// public void DuplicateSelectedElements() { @@ -2680,7 +2666,7 @@ namespace Greenshot.Editor.Drawing return _elements.CanPushDown(selectedElements); } - public void Element_FieldChanged(object sender, FieldChangedEventArgs e) + private void Element_FieldChanged(object sender, FieldChangedEventArgs e) { selectedElements.HandleFieldChangedEvent(sender, e); } @@ -2738,20 +2724,18 @@ namespace Greenshot.Editor.Drawing { return rc; } - else + + Point[] points = { - Point[] points = - { - rc.Location, rc.Location + rc.Size - }; - _inverseZoomMatrix.TransformPoints(points); - return new Rectangle( - points[0].X, - points[0].Y, - points[1].X - points[0].X, - points[1].Y - points[0].Y - ); - } + rc.Location, rc.Location + rc.Size + }; + _inverseZoomMatrix.TransformPoints(points); + return new Rectangle( + points[0].X, + points[0].Y, + points[1].X - points[0].X, + points[1].Y - points[0].Y + ); } } } \ No newline at end of file diff --git a/src/Greenshot.Editor/Memento/AddElementMemento.cs b/src/Greenshot.Editor/Memento/AddElementMemento.cs index 1a95d19ce..b76858780 100644 --- a/src/Greenshot.Editor/Memento/AddElementMemento.cs +++ b/src/Greenshot.Editor/Memento/AddElementMemento.cs @@ -44,7 +44,7 @@ namespace Greenshot.Editor.Memento GC.SuppressFinalize(this); } - protected virtual void Dispose(bool disposing) + private void Dispose(bool disposing) { //if (disposing) { } _drawableContainer = null; diff --git a/src/Greenshot.Editor/Memento/AddElementsMemento.cs b/src/Greenshot.Editor/Memento/AddElementsMemento.cs index 8649dec9b..0b11fac15 100644 --- a/src/Greenshot.Editor/Memento/AddElementsMemento.cs +++ b/src/Greenshot.Editor/Memento/AddElementsMemento.cs @@ -43,7 +43,7 @@ namespace Greenshot.Editor.Memento Dispose(true); } - protected virtual void Dispose(bool disposing) + private void Dispose(bool disposing) { if (disposing) { diff --git a/src/Greenshot.Editor/Memento/ChangeFieldHolderMemento.cs b/src/Greenshot.Editor/Memento/ChangeFieldHolderMemento.cs index 1ffa8c16e..70dba9252 100644 --- a/src/Greenshot.Editor/Memento/ChangeFieldHolderMemento.cs +++ b/src/Greenshot.Editor/Memento/ChangeFieldHolderMemento.cs @@ -44,7 +44,7 @@ namespace Greenshot.Editor.Memento Dispose(true); } - protected virtual void Dispose(bool disposing) + private void Dispose(bool disposing) { if (disposing) { diff --git a/src/Greenshot.Editor/Memento/DeleteElementMemento.cs b/src/Greenshot.Editor/Memento/DeleteElementMemento.cs index 0acc19f83..1d744239d 100644 --- a/src/Greenshot.Editor/Memento/DeleteElementMemento.cs +++ b/src/Greenshot.Editor/Memento/DeleteElementMemento.cs @@ -45,7 +45,7 @@ namespace Greenshot.Editor.Memento GC.SuppressFinalize(this); } - protected virtual void Dispose(bool disposing) + private void Dispose(bool disposing) { if (!disposing) return; diff --git a/src/Greenshot.Editor/Memento/DeleteElementsMemento.cs b/src/Greenshot.Editor/Memento/DeleteElementsMemento.cs index e4b0b747e..509bbb016 100644 --- a/src/Greenshot.Editor/Memento/DeleteElementsMemento.cs +++ b/src/Greenshot.Editor/Memento/DeleteElementsMemento.cs @@ -43,7 +43,7 @@ namespace Greenshot.Editor.Memento Dispose(true); } - protected virtual void Dispose(bool disposing) + private void Dispose(bool disposing) { if (disposing) { diff --git a/src/Greenshot.Editor/Memento/DrawableContainerBoundsChangeMemento.cs b/src/Greenshot.Editor/Memento/DrawableContainerBoundsChangeMemento.cs index 428b0ff3d..b5b97e4cf 100644 --- a/src/Greenshot.Editor/Memento/DrawableContainerBoundsChangeMemento.cs +++ b/src/Greenshot.Editor/Memento/DrawableContainerBoundsChangeMemento.cs @@ -34,30 +34,30 @@ namespace Greenshot.Editor.Memento { private readonly List _points = new(); private readonly List _sizes = new(); - private IDrawableContainerList _listOfdrawableContainer; + private IDrawableContainerList _listOfDrawableContainer; private void StoreBounds() { - foreach (IDrawableContainer drawableContainer in _listOfdrawableContainer) + foreach (IDrawableContainer drawableContainer in _listOfDrawableContainer) { _points.Add(drawableContainer.Location); _sizes.Add(drawableContainer.Size); } } - public DrawableContainerBoundsChangeMemento(IDrawableContainerList listOfdrawableContainer) + public DrawableContainerBoundsChangeMemento(IDrawableContainerList listOfDrawableContainer) { - _listOfdrawableContainer = listOfdrawableContainer; + _listOfDrawableContainer = listOfDrawableContainer; StoreBounds(); } public DrawableContainerBoundsChangeMemento(IDrawableContainer drawableContainer) { - _listOfdrawableContainer = new DrawableContainerList + _listOfDrawableContainer = new DrawableContainerList { drawableContainer }; - _listOfdrawableContainer.Parent = drawableContainer.Parent; + _listOfDrawableContainer.Parent = drawableContainer.Parent; StoreBounds(); } @@ -66,21 +66,21 @@ namespace Greenshot.Editor.Memento Dispose(true); } - protected virtual void Dispose(bool disposing) + private void Dispose(bool disposing) { if (disposing) { - _listOfdrawableContainer?.Dispose(); + _listOfDrawableContainer?.Dispose(); } - _listOfdrawableContainer = null; + _listOfDrawableContainer = null; } public bool Merge(IMemento otherMemento) { if (otherMemento is not DrawableContainerBoundsChangeMemento other) return false; - if (ObjectExtensions.CompareLists(_listOfdrawableContainer, other._listOfdrawableContainer)) + if (ObjectExtensions.CompareLists(_listOfDrawableContainer, other._listOfDrawableContainer)) { // Lists are equal, as we have the state already we can ignore the new memento return true; @@ -91,10 +91,10 @@ namespace Greenshot.Editor.Memento public IMemento Restore() { - var oldState = new DrawableContainerBoundsChangeMemento(_listOfdrawableContainer); - for (int index = 0; index < _listOfdrawableContainer.Count; index++) + var oldState = new DrawableContainerBoundsChangeMemento(_listOfDrawableContainer); + for (int index = 0; index < _listOfDrawableContainer.Count; index++) { - IDrawableContainer drawableContainer = _listOfdrawableContainer[index]; + IDrawableContainer drawableContainer = _listOfDrawableContainer[index]; // Before drawableContainer.Invalidate(); drawableContainer.Left = _points[index].X; diff --git a/src/Greenshot.Editor/Memento/SurfaceBackgroundChangeMemento.cs b/src/Greenshot.Editor/Memento/SurfaceBackgroundChangeMemento.cs index c6ba814c3..8c49614b4 100644 --- a/src/Greenshot.Editor/Memento/SurfaceBackgroundChangeMemento.cs +++ b/src/Greenshot.Editor/Memento/SurfaceBackgroundChangeMemento.cs @@ -52,7 +52,7 @@ namespace Greenshot.Editor.Memento Dispose(true); } - protected virtual void Dispose(bool disposing) + private void Dispose(bool disposing) { if (!disposing) return; diff --git a/src/Greenshot.Editor/Memento/TextChangeMemento.cs b/src/Greenshot.Editor/Memento/TextChangeMemento.cs index 411dde53c..46f33592b 100644 --- a/src/Greenshot.Editor/Memento/TextChangeMemento.cs +++ b/src/Greenshot.Editor/Memento/TextChangeMemento.cs @@ -43,7 +43,7 @@ namespace Greenshot.Editor.Memento Dispose(true); } - protected virtual void Dispose(bool disposing) + private void Dispose(bool disposing) { if (disposing) {