Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MSPAINT] Reset scroll position in some situations (#5789)

Browse source 
In some situations, the scroll position should be reset.
- Add CCanvasWindow::resetScrollPos method.
- Reset the scroll position on loading a file.
- Reset the scroll position on mirroring/rotating
  the image.
CORE-19094
This commit is contained in:
Katayama Hirofumi MZ 2023-10-12 22:59:17 +09:00 committed by GitHub
parent 9a51c8e6c6
commit 1183e797b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -199,6 +199,12 @@ VOID CCanvasWindow::updateScrollInfo()
SetScrollInfo(SB_VERT, &si); SetScrollInfo(SB_VERT, &si);
} }
VOID CCanvasWindow::resetScrollPos()
{
SetScrollPos(SB_HORZ, 0);
SetScrollPos(SB_VERT, 0);
}
LRESULT CCanvasWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) LRESULT CCanvasWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{ {
if (m_hWnd) if (m_hWnd)

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

@ -43,6 +43,7 @@ public:
VOID cancelDrawing(); VOID cancelDrawing();
VOID finishDrawing(); VOID finishDrawing();
VOID updateScrollInfo(); VOID updateScrollInfo();
VOID resetScrollPos();
VOID ImageToCanvas(POINT& pt); VOID ImageToCanvas(POINT& pt);
VOID ImageToCanvas(RECT& rc); VOID ImageToCanvas(RECT& rc);

1
base/applications/mspaint/dib.cpp
View file

@ -241,6 +241,7 @@ HBITMAP InitializeImage(LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile)
HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile) HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile)
{ {
// update image // update image
canvasWindow.resetScrollPos();
imageModel.PushImageForUndo(hBitmap); imageModel.PushImageForUndo(hBitmap);
imageModel.ClearHistory(); imageModel.ClearHistory();

1
base/applications/mspaint/winproc.cpp
View file

@ -921,6 +921,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH
case IDM_IMAGEROTATEMIRROR: case IDM_IMAGEROTATEMIRROR:
{ {
CWaitCursor waitCursor; CWaitCursor waitCursor;
canvasWindow.resetScrollPos();
switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd))
{ {
case 1: /* flip horizontally */ case 1: /* flip horizontally */