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

[MSPAINT] Add Zoomed and UnZoomed and use them (#4188)

Browse source 
- Define Zoomed and UnZoomed helper functions.
- Use them.
CORE-17931
This commit is contained in:
Katayama Hirofumi MZ 2021-12-26 19:49:56 +09:00 • committed by GitHub
parent 50cb4b3cb7
commit 9e1386db43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 59 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

16
base/applications/mspaint/selection.cpp
View file

@ -99,8 +99,8 @@ LRESULT CSelectionWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL&
{
HDC hDC = GetDC();
DefWindowProc(WM_PAINT, wParam, lParam);
SelectionFrame(hDC, 1, 1, selectionModel.GetDestRectWidth() * toolsModel.GetZoom() / 1000 + 5,
selectionModel.GetDestRectHeight() * toolsModel.GetZoom() / 1000 + 5,
SelectionFrame(hDC, 1, 1, Zoomed(selectionModel.GetDestRectWidth()) + 5,
Zoomed(selectionModel.GetDestRectHeight()) + 5,
m_dwSystemSelectionColor);
ReleaseDC(hDC);
}
@ -161,8 +161,8 @@ LRESULT CSelectionWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, B
imageModel.ResetToPrevious();
m_ptFrac.x += GET_X_LPARAM(lParam) - m_ptPos.x;
m_ptFrac.y += GET_Y_LPARAM(lParam) - m_ptPos.y;
m_ptDelta.x += m_ptFrac.x * 1000 / toolsModel.GetZoom();
m_ptDelta.y += m_ptFrac.y * 1000 / toolsModel.GetZoom();
m_ptDelta.x += UnZoomed(m_ptFrac.x);
m_ptDelta.y += UnZoomed(m_ptFrac.y);
if (toolsModel.GetZoom() < 1000)
{
m_ptFrac.x = 0;
@ -170,8 +170,8 @@ LRESULT CSelectionWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, B
}
else
{
m_ptFrac.x -= (m_ptFrac.x * 1000 / toolsModel.GetZoom()) * toolsModel.GetZoom() / 1000;
m_ptFrac.y -= (m_ptFrac.y * 1000 / toolsModel.GetZoom()) * toolsModel.GetZoom() / 1000;
m_ptFrac.x -= Zoomed(UnZoomed(m_ptFrac.x));
m_ptFrac.y -= Zoomed(UnZoomed(m_ptFrac.y));
}
selectionModel.ModifyDestRect(m_ptDelta, m_iAction);
@ -197,8 +197,8 @@ LRESULT CSelectionWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, B
}
else
{
int w = selectionModel.GetDestRectWidth() * toolsModel.GetZoom() / 1000 + 6;
int h = selectionModel.GetDestRectHeight() * toolsModel.GetZoom() / 1000 + 6;
int w = Zoomed(selectionModel.GetDestRectWidth()) + 6;
int h = Zoomed(selectionModel.GetDestRectHeight()) + 6;
m_ptPos.x = GET_X_LPARAM(lParam);
m_ptPos.y = GET_Y_LPARAM(lParam);
SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) NULL);