mirror of
https://github.com/reactos/reactos.git
synced 2025-05-07 18:56:48 +00:00
[MSPAINT] Add selectionModel.moveSelection and use it
Refactoring. CORE-19094
This commit is contained in:
parent
58c26d3fe6
commit
f935132fbe
5 changed files with 15 additions and 15 deletions
|
@ -770,16 +770,6 @@ VOID CCanvasWindow::EndSelectionDrag(POINT ptImage)
|
||||||
Invalidate(FALSE);
|
Invalidate(FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
VOID CCanvasWindow::MoveSelection(INT xDelta, INT yDelta)
|
|
||||||
{
|
|
||||||
if (!selectionModel.m_bShow)
|
|
||||||
return;
|
|
||||||
|
|
||||||
selectionModel.TakeOff();
|
|
||||||
::OffsetRect(&selectionModel.m_rc, xDelta, yDelta);
|
|
||||||
Invalidate(FALSE);
|
|
||||||
}
|
|
||||||
|
|
||||||
LRESULT CCanvasWindow::OnCtlColorEdit(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
|
LRESULT CCanvasWindow::OnCtlColorEdit(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
|
||||||
{
|
{
|
||||||
SetTextColor((HDC)wParam, paletteModel.GetFgColor());
|
SetTextColor((HDC)wParam, paletteModel.GetFgColor());
|
||||||
|
|
|
@ -52,7 +52,6 @@ public:
|
||||||
VOID CanvasToImage(POINT& pt);
|
VOID CanvasToImage(POINT& pt);
|
||||||
VOID CanvasToImage(RECT& rc);
|
VOID CanvasToImage(RECT& rc);
|
||||||
VOID GetImageRect(RECT& rc);
|
VOID GetImageRect(RECT& rc);
|
||||||
VOID MoveSelection(INT xDelta, INT yDelta);
|
|
||||||
VOID getNewZoomRect(CRect& rcView, INT newZoom, CPoint ptTarget);
|
VOID getNewZoomRect(CRect& rcView, INT newZoom, CPoint ptTarget);
|
||||||
VOID zoomTo(INT newZoom, LONG left = 0, LONG top = 0);
|
VOID zoomTo(INT newZoom, LONG left = 0, LONG top = 0);
|
||||||
|
|
||||||
|
|
|
@ -551,6 +551,16 @@ void SelectionModel::drawFrameOnCanvas(HDC hCanvasDC)
|
||||||
drawSizeBoxes(hCanvasDC, &rcSelection, TRUE);
|
drawSizeBoxes(hCanvasDC, &rcSelection, TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void SelectionModel::moveSelection(INT xDelta, INT yDelta)
|
||||||
|
{
|
||||||
|
if (!m_bShow)
|
||||||
|
return;
|
||||||
|
|
||||||
|
TakeOff();
|
||||||
|
::OffsetRect(&m_rc, xDelta, yDelta);
|
||||||
|
canvasWindow.Invalidate();
|
||||||
|
}
|
||||||
|
|
||||||
void SelectionModel::StretchSelection(BOOL bShrink)
|
void SelectionModel::StretchSelection(BOOL bShrink)
|
||||||
{
|
{
|
||||||
if (!m_bShow)
|
if (!m_bShow)
|
||||||
|
|
|
@ -41,6 +41,7 @@ public:
|
||||||
void DeleteSelection();
|
void DeleteSelection();
|
||||||
HITTEST hitTest(POINT ptCanvas);
|
HITTEST hitTest(POINT ptCanvas);
|
||||||
void drawFrameOnCanvas(HDC hCanvasDC);
|
void drawFrameOnCanvas(HDC hCanvasDC);
|
||||||
|
void moveSelection(INT xDelta, INT yDelta);
|
||||||
|
|
||||||
HBITMAP GetSelectionContents();
|
HBITMAP GetSelectionContents();
|
||||||
void DrawFramePoly(HDC hDCImage);
|
void DrawFramePoly(HDC hDCImage);
|
||||||
|
|
|
@ -529,16 +529,16 @@ LRESULT CMainWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case VK_LEFT:
|
case VK_LEFT:
|
||||||
canvasWindow.MoveSelection(-1, 0);
|
selectionModel.moveSelection(-1, 0);
|
||||||
break;
|
break;
|
||||||
case VK_RIGHT:
|
case VK_RIGHT:
|
||||||
canvasWindow.MoveSelection(+1, 0);
|
selectionModel.moveSelection(+1, 0);
|
||||||
break;
|
break;
|
||||||
case VK_UP:
|
case VK_UP:
|
||||||
canvasWindow.MoveSelection(0, -1);
|
selectionModel.moveSelection(0, -1);
|
||||||
break;
|
break;
|
||||||
case VK_DOWN:
|
case VK_DOWN:
|
||||||
canvasWindow.MoveSelection(0, +1);
|
selectionModel.moveSelection(0, +1);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue