Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 07:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSPAINT] Simplify CanvasToImage

Browse source 
Refactoring. CORE-19094
This commit is contained in:
Katayama Hirofumi MZ 2023-11-23 14:22:40 +09:00
parent 4a52a4b04c
commit 58c26d3fe6
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
base/applications/mspaint/canvas.cpp
View file

@ -51,20 +51,16 @@ VOID CCanvasWindow::ImageToCanvas(RECT& rc)
::OffsetRect(&rc, GRIP_SIZE - GetScrollPos(SB_HORZ), GRIP_SIZE - GetScrollPos(SB_VERT)); ::OffsetRect(&rc, GRIP_SIZE - GetScrollPos(SB_HORZ), GRIP_SIZE - GetScrollPos(SB_VERT));
} }
VOID CCanvasWindow::CanvasToImage(POINT& pt, BOOL bZoomed) VOID CCanvasWindow::CanvasToImage(POINT& pt)
{ {
pt.x -= GRIP_SIZE - GetScrollPos(SB_HORZ); pt.x -= GRIP_SIZE - GetScrollPos(SB_HORZ);
pt.y -= GRIP_SIZE - GetScrollPos(SB_VERT); pt.y -= GRIP_SIZE - GetScrollPos(SB_VERT);
if (bZoomed)
return;
UnZoomed(pt); UnZoomed(pt);
} }
VOID CCanvasWindow::CanvasToImage(RECT& rc, BOOL bZoomed) VOID CCanvasWindow::CanvasToImage(RECT& rc)
{ {
::OffsetRect(&rc, GetScrollPos(SB_HORZ) - GRIP_SIZE, GetScrollPos(SB_VERT) - GRIP_SIZE); ::OffsetRect(&rc, GetScrollPos(SB_HORZ) - GRIP_SIZE, GetScrollPos(SB_VERT) - GRIP_SIZE);
if (bZoomed)
return;
UnZoomed(rc); UnZoomed(rc);
} }
@ -367,12 +363,11 @@ LRESULT CCanvasWindow::OnButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO
return 0; return 0;
} }
CanvasToImage(pt, TRUE); CanvasToImage(pt);
if (hit == HIT_INNER) if (hit == HIT_INNER)
{ {
m_drawing = TRUE; m_drawing = TRUE;
UnZoomed(pt);
SetCapture(); SetCapture();
toolsModel.OnButtonDown(bLeftButton, pt.x, pt.y, FALSE); toolsModel.OnButtonDown(bLeftButton, pt.x, pt.y, FALSE);
Invalidate(FALSE); Invalidate(FALSE);
@ -382,10 +377,10 @@ LRESULT CCanvasWindow::OnButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO
if (bLeftButton) if (bLeftButton)
{ {
m_hitCanvasSizeBox = hit; m_hitCanvasSizeBox = hit;
UnZoomed(pt);
m_ptOrig = pt; m_ptOrig = pt;
SetCapture(); SetCapture();
} }
return 0; return 0;
} }

4
base/applications/mspaint/canvas.h
View file

@ -49,8 +49,8 @@ public:
VOID ImageToCanvas(POINT& pt); VOID ImageToCanvas(POINT& pt);
VOID ImageToCanvas(RECT& rc); VOID ImageToCanvas(RECT& rc);
VOID CanvasToImage(POINT& pt, BOOL bZoomed = FALSE); VOID CanvasToImage(POINT& pt);
VOID CanvasToImage(RECT& rc, BOOL bZoomed = FALSE); VOID CanvasToImage(RECT& rc);
VOID GetImageRect(RECT& rc); VOID GetImageRect(RECT& rc);
VOID MoveSelection(INT xDelta, INT yDelta); VOID MoveSelection(INT xDelta, INT yDelta);
VOID getNewZoomRect(CRect& rcView, INT newZoom, CPoint ptTarget); VOID getNewZoomRect(CRect& rcView, INT newZoom, CPoint ptTarget);