Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 05:15:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSPAINT] Refactor ImageModel (#5335)

Browse source 
- Unify ImageModel::Insert and ImageModel::CopyPrevious to ImageModel::PushImageForUndo.
- Delete useless stuffs.
- Fix some memory leaks.
- Fix IDM_IMAGECROP.
CORE-17969, CORE-18867
This commit is contained in:
Katayama Hirofumi MZ 2023-06-13 23:23:48 +09:00 • committed by GitHub
parent 70f897e4c9
commit 2b623c1d04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 144 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

18
base/applications/mspaint/mouse.cpp
View file

@ -113,7 +113,7 @@ struct FreeSelTool : ToolBase
selectionModel.Landing();
if (bLeftButton)
{
imageModel.CopyPrevious();
imageModel.PushImageForUndo();
selectionModel.m_bShow = FALSE;
selectionModel.ResetPtStack();
POINT pt = { x, y };
@ -187,7 +187,7 @@ struct RectSelTool : ToolBase
selectionModel.Landing();
if (bLeftButton)
{
imageModel.CopyPrevious();
imageModel.PushImageForUndo();
selectionModel.m_bShow = FALSE;
::SetRectEmpty(&selectionModel.m_rc);
}
@ -246,7 +246,7 @@ struct GenericDrawTool : ToolBase
void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick)
{
imageModel.CopyPrevious();
imageModel.PushImageForUndo();
draw(bLeftButton, x, y);
}
@ -293,7 +293,7 @@ struct FillTool : ToolBase
void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick)
{
imageModel.CopyPrevious();
imageModel.PushImageForUndo();
Fill(m_hdc, x, y, bLeftButton ? m_fg : m_bg);
}
};
@ -341,7 +341,7 @@ struct ZoomTool : ToolBase
void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick)
{
imageModel.CopyPrevious();
imageModel.PushImageForUndo();
if (bLeftButton)
{
if (toolsModel.GetZoom() < MAX_ZOOM)
@ -419,7 +419,7 @@ struct TextTool : ToolBase
if (!textEditWindow.IsWindow())
textEditWindow.Create(canvasWindow);
imageModel.CopyPrevious();
imageModel.PushImageForUndo();
UpdatePoint(x, y);
}
@ -449,7 +449,7 @@ struct TextTool : ToolBase
// Draw the text
INT style = (toolsModel.IsBackgroundTransparent() ? 0 : 1);
imageModel.CopyPrevious();
imageModel.PushImageForUndo();
Text(m_hdc, rc.left, rc.top, rc.right, rc.bottom, m_fg, m_bg, szText,
textEditWindow.GetFont(), style);
@ -554,7 +554,7 @@ struct BezierTool : ToolBase
if (pointSP == 0)
{
imageModel.CopyPrevious();
imageModel.PushImageForUndo();
pointSP++;
}
}
@ -642,7 +642,7 @@ struct ShapeTool : ToolBase
if (pointSP == 0 && !bDoubleClick)
{
imageModel.CopyPrevious();
imageModel.PushImageForUndo();
draw(bLeftButton, x, y);
pointSP++;
}