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

[NOTEPAD] Use wait cursor (#5659)

Browse source 
- Add WaitCursor helper function to display the wait cursor while
  heavy operation.
- Manage the wait cursor by using a lock count.
CORE-18837
This commit is contained in:
Katayama Hirofumi MZ 2023-09-10 22:27:16 +09:00 • committed by GitHub
parent 7497f028f4
commit 0ef9cfb04e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

43
base/applications/notepad/dialog.c
View file

@ -111,6 +111,33 @@ void UpdateWindowCaption(BOOL clearModifyAlert)
SetWindowText(Globals.hMainWnd, szCaption);
}
VOID WaitCursor(BOOL bBegin)
{
static HCURSOR s_hWaitCursor = NULL;
static HCURSOR s_hOldCursor = NULL;
static INT s_nLock = 0;
if (bBegin)
{
if (s_nLock++ == 0)
{
if (s_hWaitCursor == NULL)
s_hWaitCursor = LoadCursor(NULL, IDC_WAIT);
s_hOldCursor = SetCursor(s_hWaitCursor);
}
else
{
SetCursor(s_hWaitCursor);
}
}
else
{
if (--s_nLock == 0)
SetCursor(s_hOldCursor);
}
}
VOID DIALOG_StatusBarAlignParts(VOID)
{
static const int defaultWidths[] = {120, 120, 120};
@ -220,11 +247,14 @@ static BOOL DoSaveFile(VOID)
HANDLE hFile;
DWORD cchText;
WaitCursor(TRUE);
hFile = CreateFileW(Globals.szFileName, GENERIC_WRITE, FILE_SHARE_WRITE,
NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
if (hFile == INVALID_HANDLE_VALUE)
{
ShowLastError();
WaitCursor(FALSE);
return FALSE;
}
@ -259,6 +289,7 @@ static BOOL DoSaveFile(VOID)
SetFileName(Globals.szFileName);
}
WaitCursor(FALSE);
return bRet;
}
@ -307,6 +338,8 @@ VOID DoOpenFile(LPCTSTR szFileName)
if (!DoCloseFile())
return;
WaitCursor(TRUE);
hFile = CreateFile(szFileName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
if (hFile == INVALID_HANDLE_VALUE)
@ -347,6 +380,7 @@ VOID DoOpenFile(LPCTSTR szFileName)
done:
if (hFile != INVALID_HANDLE_VALUE)
CloseHandle(hFile);
WaitCursor(FALSE);
}
VOID DIALOG_FileNew(VOID)
@ -355,6 +389,8 @@ VOID DIALOG_FileNew(VOID)
if (!DoCloseFile())
return;
WaitCursor(TRUE);
SetWindowText(Globals.hEdit, NULL);
SendMessage(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0);
Globals.iEoln = EOLN_CRLF;
@ -362,13 +398,20 @@ VOID DIALOG_FileNew(VOID)
NOTEPAD_EnableSearchMenu();
DIALOG_StatusBarUpdateAll();
WaitCursor(FALSE);
}
VOID DIALOG_FileNewWindow(VOID)
{
TCHAR pszNotepadExe[MAX_PATH];
WaitCursor(TRUE);
GetModuleFileName(NULL, pszNotepadExe, _countof(pszNotepadExe));
ShellExecute(NULL, NULL, pszNotepadExe, NULL, NULL, SW_SHOWNORMAL);
WaitCursor(FALSE);
}
VOID DIALOG_FileOpen(VOID)

1
base/applications/notepad/dialog.h
View file

@ -57,3 +57,4 @@ VOID DoOpenFile(LPCTSTR szFileName);
VOID DoShowHideStatusBar(VOID);
VOID DoCreateEditWindow(VOID);
void UpdateWindowCaption(BOOL clearModifyAlert);
VOID WaitCursor(BOOL bBegin);

6
base/applications/notepad/main.c
View file

@ -433,6 +433,8 @@ NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
FINDREPLACE *pFindReplace = (FINDREPLACE *) lParam;
Globals.find = *(FINDREPLACE *) lParam;
WaitCursor(TRUE);
if (pFindReplace->Flags & FR_FINDNEXT)
NOTEPAD_FindNext(pFindReplace, FALSE, TRUE);
else if (pFindReplace->Flags & FR_REPLACE)
@ -441,6 +443,8 @@ NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
NOTEPAD_ReplaceAll(pFindReplace);
else if (pFindReplace->Flags & FR_DIALOGTERM)
NOTEPAD_FindTerm();
WaitCursor(FALSE);
break;
}
@ -587,7 +591,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE prev, LPTSTR cmdline, int sh
wndclass.lpfnWndProc = NOTEPAD_WndProc;
wndclass.hInstance = Globals.hInstance;
wndclass.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_NPICON));
wndclass.hCursor = LoadCursor(0, IDC_ARROW);
wndclass.hCursor = LoadCursor(NULL, IDC_ARROW);
wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
wndclass.lpszMenuName = MAKEINTRESOURCE(MAIN_MENU);
wndclass.lpszClassName = className;