mirror of
https://github.com/reactos/reactos.git
synced 2024-10-02 23:46:50 +00:00
- Fix cursor position bug after turn off word wrap. Patch by Alexey Komarov
See issue #3702 for more details. svn path=/trunk/; revision=43037
This commit is contained in:
parent
6fd2ea71d2
commit
7cf92c45bd
|
@ -22,6 +22,8 @@
|
||||||
|
|
||||||
#include <notepad.h>
|
#include <notepad.h>
|
||||||
|
|
||||||
|
LRESULT CALLBACK EDIT_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
|
||||||
|
|
||||||
static const TCHAR helpfile[] = _T("notepad.hlp");
|
static const TCHAR helpfile[] = _T("notepad.hlp");
|
||||||
static const TCHAR empty_str[] = _T("");
|
static const TCHAR empty_str[] = _T("");
|
||||||
static const TCHAR szDefaultExt[] = _T("txt");
|
static const TCHAR szDefaultExt[] = _T("txt");
|
||||||
|
@ -695,6 +697,7 @@ VOID DIALOG_EditWrap(VOID)
|
||||||
RECT rc, rcstatus;
|
RECT rc, rcstatus;
|
||||||
DWORD size;
|
DWORD size;
|
||||||
LPTSTR pTemp;
|
LPTSTR pTemp;
|
||||||
|
TCHAR buff[MAX_PATH];
|
||||||
|
|
||||||
Globals.bWrapLongLines = !Globals.bWrapLongLines;
|
Globals.bWrapLongLines = !Globals.bWrapLongLines;
|
||||||
|
|
||||||
|
@ -725,10 +728,13 @@ VOID DIALOG_EditWrap(VOID)
|
||||||
Globals.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, edit, NULL, dwStyle,
|
Globals.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, edit, NULL, dwStyle,
|
||||||
0, 0, rc.right, rc.bottom, Globals.hMainWnd,
|
0, 0, rc.right, rc.bottom, Globals.hMainWnd,
|
||||||
NULL, Globals.hInstance, NULL);
|
NULL, Globals.hInstance, NULL);
|
||||||
SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)FALSE);
|
SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, FALSE);
|
||||||
SendMessage(Globals.hEdit, EM_LIMITTEXT, 0, 0);
|
SendMessage(Globals.hEdit, EM_LIMITTEXT, 0, 0);
|
||||||
SetWindowText(Globals.hEdit, pTemp);
|
SetWindowText(Globals.hEdit, pTemp);
|
||||||
SetFocus(Globals.hEdit);
|
SetFocus(Globals.hEdit);
|
||||||
|
Globals.EditProc = (WNDPROC) SetWindowLongPtr(Globals.hEdit, GWLP_WNDPROC, (LONG_PTR)EDIT_WndProc);
|
||||||
|
_stprintf(buff, Globals.szStatusBarLineCol, 1, 1);
|
||||||
|
SendMessage(Globals.hStatusBar, SB_SETTEXT, SB_SIMPLEID, (LPARAM)buff);
|
||||||
HeapFree(GetProcessHeap(), 0, pTemp);
|
HeapFree(GetProcessHeap(), 0, pTemp);
|
||||||
DrawMenuBar(Globals.hMainWnd);
|
DrawMenuBar(Globals.hMainWnd);
|
||||||
}
|
}
|
||||||
|
@ -879,7 +885,7 @@ VOID DIALOG_StatusBarUpdateCaretPos(VOID)
|
||||||
col = dwStart - SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, 0);
|
col = dwStart - SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, 0);
|
||||||
|
|
||||||
_stprintf(buff, Globals.szStatusBarLineCol, line+1, col+1);
|
_stprintf(buff, Globals.szStatusBarLineCol, line+1, col+1);
|
||||||
SendMessage(Globals.hStatusBar, SB_SETTEXT, (WPARAM) SB_SIMPLEID, (LPARAM)buff);
|
SendMessage(Globals.hStatusBar, SB_SETTEXT, SB_SIMPLEID, (LPARAM)buff);
|
||||||
}
|
}
|
||||||
|
|
||||||
VOID DIALOG_ViewStatusBar(VOID)
|
VOID DIALOG_ViewStatusBar(VOID)
|
||||||
|
|
Loading…
Reference in a new issue