https://git.reactos.org/?p=reactos.git;a=commitdiff;h=993a45024e5e9467d5dda67dd4c5532463e883f6
commit 993a45024e5e9467d5dda67dd4c5532463e883f6 Author: Katayama Hirofumi MZ <[email protected]> AuthorDate: Sun Sep 10 22:28:28 2023 +0900 Commit: GitHub <[email protected]> CommitDate: Sun Sep 10 22:28:28 2023 +0900 [MSPAINT] Use wait cursor (#5660) - Implement CWaitCursor class in newly-added "waitcursor.h". - Use CWaitCursor to manage the wait cursor. - Improve WM_SETCURSOR handlings. CORE-19094 --- base/applications/mspaint/canvas.cpp | 6 +++ base/applications/mspaint/dib.cpp | 16 ++++++++ base/applications/mspaint/precomp.h | 1 + base/applications/mspaint/textedit.cpp | 6 +++ base/applications/mspaint/waitcursor.h | 54 +++++++++++++++++++++++++++ base/applications/mspaint/winproc.cpp | 67 ++++++++++++++++++---------------- 6 files changed, 119 insertions(+), 31 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 3568657a21f..186b88dc044 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -635,6 +635,12 @@ LRESULT CCanvasWindow::OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + if (CWaitCursor::IsWaiting()) + { + bHandled = FALSE; + return 0; + } + POINT pt; ::GetCursorPos(&pt); ScreenToClient(&pt); diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index e770f5494d0..ee899c74e98 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -151,6 +151,8 @@ GetDIBHeight(HBITMAP hBitmap) BOOL SaveDIBToFile(HBITMAP hBitmap, LPCWSTR FileName, BOOL fIsMainFile, REFGUID guidFileType) { + CWaitCursor waitCursor; + CImageDx img; img.Attach(hBitmap); HRESULT hr = img.SaveDx(FileName, guidFileType, g_xDpi, g_yDpi); @@ -250,6 +252,8 @@ HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCWSTR name, LPWIN32_FIND_DATAW pFoun HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile) { + CWaitCursor waitCursor; + // find the file WIN32_FIND_DATA find; HANDLE hFind = ::FindFirstFileW(name, &find); @@ -341,6 +345,8 @@ HBITMAP Rotate90DegreeBlt(HDC hDC1, INT cx, INT cy, BOOL bRight, BOOL bMono) HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical, BOOL bMono) { + CWaitCursor waitCursor; + if (nDegree == 0) return CopyDIBImage(hbm); @@ -402,6 +408,8 @@ struct BITMAPINFODX : BITMAPINFO HGLOBAL BitmapToClipboardDIB(HBITMAP hBitmap) { + CWaitCursor waitCursor; + BITMAP bm; if (!GetObject(hBitmap, sizeof(BITMAP), &bm)) return NULL; @@ -463,6 +471,8 @@ HGLOBAL BitmapToClipboardDIB(HBITMAP hBitmap) HBITMAP BitmapFromClipboardDIB(HGLOBAL hGlobal) { + CWaitCursor waitCursor; + LPBYTE pb = (LPBYTE)GlobalLock(hGlobal); if (!pb) return NULL; @@ -508,6 +518,8 @@ HBITMAP BitmapFromClipboardDIB(HGLOBAL hGlobal) HBITMAP BitmapFromHEMF(HENHMETAFILE hEMF) { + CWaitCursor waitCursor; + ENHMETAHEADER header; if (!GetEnhMetaFileHeader(hEMF, sizeof(header), &header)) return NULL; @@ -529,6 +541,8 @@ HBITMAP BitmapFromHEMF(HENHMETAFILE hEMF) BOOL IsBitmapBlackAndWhite(HBITMAP hbm) { + CWaitCursor waitCursor; + BITMAP bm; if (!::GetObjectW(hbm, sizeof(bm), &bm)) return FALSE; @@ -578,6 +592,8 @@ Finish: HBITMAP ConvertToBlackAndWhite(HBITMAP hbm) { + CWaitCursor waitCursor; + BITMAP bm; if (!::GetObject(hbm, sizeof(bm), &bm)) return NULL; diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 385cc985a4f..0c1d6b33ba8 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -50,6 +50,7 @@ #include "toolsmodel.h" #include "winproc.h" #include "dialogs.h" +#include "waitcursor.h" #include "globalvar.h" #endif /* _MSPAINT_H */ diff --git a/base/applications/mspaint/textedit.cpp b/base/applications/mspaint/textedit.cpp index e5b51aa3de3..376b1214045 100644 --- a/base/applications/mspaint/textedit.cpp +++ b/base/applications/mspaint/textedit.cpp @@ -187,6 +187,12 @@ LRESULT CTextEditWindow::OnNCHitTest(UINT nMsg, WPARAM wParam, LPARAM lParam, BO LRESULT CTextEditWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + if (CWaitCursor::IsWaiting()) + { + bHandled = FALSE; + return 0; + } + UINT nHitTest = LOWORD(lParam); if (nHitTest == HTCAPTION) { diff --git a/base/applications/mspaint/waitcursor.h b/base/applications/mspaint/waitcursor.h new file mode 100644 index 00000000000..20269ed16eb --- /dev/null +++ b/base/applications/mspaint/waitcursor.h @@ -0,0 +1,54 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Wait cursor management + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <[email protected]> + */ + +#pragma once + +class CWaitCursor +{ +public: + CWaitCursor() + { + if (s_nLock++ == 0) + { + if (!s_hWaitCursor) + s_hWaitCursor = ::LoadCursor(NULL, IDC_WAIT); + s_hOldCursor = ::SetCursor(s_hWaitCursor); + } + else + { + ::SetCursor(s_hWaitCursor); + } + } + ~CWaitCursor() + { + if (--s_nLock == 0) + { + ::SetCursor(s_hOldCursor); + s_hOldCursor = NULL; + } + } + CWaitCursor(const CWaitCursor&) = delete; + CWaitCursor& operator=(const CWaitCursor&) = delete; + + static BOOL IsWaiting() + { + return s_nLock > 0; + } + static void KeepWait() + { + ::SetCursor(s_hWaitCursor); + } + +protected: + static LONG s_nLock; + static HCURSOR s_hOldCursor; + static HCURSOR s_hWaitCursor; +}; + +DECLSPEC_SELECTANY LONG CWaitCursor::s_nLock = 0; +DECLSPEC_SELECTANY HCURSOR CWaitCursor::s_hOldCursor = NULL; +DECLSPEC_SELECTANY HCURSOR CWaitCursor::s_hWaitCursor = NULL; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 3db01639a34..c85b61b10c3 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -911,44 +911,48 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH imageModel.NotifyImageChanged(); break; case IDM_IMAGEROTATEMIRROR: - switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) { - case 1: /* flip horizontally */ - if (selectionModel.m_bShow) - selectionModel.FlipHorizontally(); - else - imageModel.FlipHorizontally(); - break; - case 2: /* flip vertically */ - if (selectionModel.m_bShow) - selectionModel.FlipVertically(); - else - imageModel.FlipVertically(); - break; - case 3: /* rotate 90 degrees */ - if (selectionModel.m_bShow) - selectionModel.RotateNTimes90Degrees(1); - else - imageModel.RotateNTimes90Degrees(1); - break; - case 4: /* rotate 180 degrees */ - if (selectionModel.m_bShow) - selectionModel.RotateNTimes90Degrees(2); - else - imageModel.RotateNTimes90Degrees(2); - break; - case 5: /* rotate 270 degrees */ - if (selectionModel.m_bShow) - selectionModel.RotateNTimes90Degrees(3); - else - imageModel.RotateNTimes90Degrees(3); - break; + CWaitCursor waitCursor; + switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) + { + case 1: /* flip horizontally */ + if (selectionModel.m_bShow) + selectionModel.FlipHorizontally(); + else + imageModel.FlipHorizontally(); + break; + case 2: /* flip vertically */ + if (selectionModel.m_bShow) + selectionModel.FlipVertically(); + else + imageModel.FlipVertically(); + break; + case 3: /* rotate 90 degrees */ + if (selectionModel.m_bShow) + selectionModel.RotateNTimes90Degrees(1); + else + imageModel.RotateNTimes90Degrees(1); + break; + case 4: /* rotate 180 degrees */ + if (selectionModel.m_bShow) + selectionModel.RotateNTimes90Degrees(2); + else + imageModel.RotateNTimes90Degrees(2); + break; + case 5: /* rotate 270 degrees */ + if (selectionModel.m_bShow) + selectionModel.RotateNTimes90Degrees(3); + else + imageModel.RotateNTimes90Degrees(3); + break; + } } break; case IDM_IMAGEATTRIBUTES: { if (attributesDialog.DoModal(mainWindow.m_hWnd)) { + CWaitCursor waitCursor; if (attributesDialog.m_bBlackAndWhite && !imageModel.IsBlackAndWhite()) { CString strText(MAKEINTRESOURCE(IDS_LOSECOLOR)); @@ -972,6 +976,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH { if (stretchSkewDialog.DoModal(mainWindow.m_hWnd)) { + CWaitCursor waitCursor; if (selectionModel.m_bShow) { selectionModel.StretchSkew(stretchSkewDialog.percentage.x, stretchSkewDialog.percentage.y,
