CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #560 from RaiKoHoff/Dev_0710

Browse Source 
Ensure caret/selection visibility
This commit is contained in:
Rainer Kottenhoff 2018-07-24 21:37:15 +02:00 committed by GitHub
commit 389ab5ea63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Edit.c
View File

@ -4387,11 +4387,6 @@ void EditEnsureSelectionVisible(HWND hwnd)
else {
iAnchorPos = SciCall_GetAnchor();
iCurrentPos = SciCall_GetCurrentPos();
if (SciCall_IsSelectionEmpty()) {
SciCall_ScrollCaret();
SciCall_ChooseCaretX();
return;
}
}
EditSelectEx(hwnd, iAnchorPos, iCurrentPos, iAnchorPosVS, iCurPosVS);
}
@ -8103,7 +8098,7 @@ void EditToggleFolds(FOLD_ACTION action, bool bForceAll)
}
}
}
if (fToggled) { SciCall_ScrollCaret(); }
if (fToggled) { EditEnsureSelectionVisible(g_hwndEdit); }
}

11
src/Notepad3.c
View File

@ -4531,10 +4531,13 @@ LRESULT MsgCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)
case IDM_VIEW_WORDWRAP:
g_bWordWrap = (g_bWordWrap) ? false : true;
if (!g_bWordWrap)
SendMessage(g_hwndEdit,SCI_SETWRAPMODE,SC_WRAP_NONE,0);
else
SendMessage(g_hwndEdit,SCI_SETWRAPMODE,(iWordWrapMode == 0) ? SC_WRAP_WHITESPACE : SC_WRAP_CHAR,0);
if (!g_bWordWrap) {
SciCall_SetWrapMode(SC_WRAP_NONE);
}
else {
SciCall_SetWrapMode((iWordWrapMode == 0) ? SC_WRAP_WHITESPACE : SC_WRAP_CHAR);
}
EditEnsureSelectionVisible(g_hwndEdit);
bWordWrapG = g_bWordWrap;
UpdateToolbar();
break;

2
src/SciCall.h
View File

@ -265,6 +265,8 @@ DeclareSciCallV1(SetFirstVisibleLine, SETFIRSTVISIBLELINE, DocLn, line)
DeclareSciCallR1(VisibleFromDocLine, VISIBLEFROMDOCLINE, DocLn, DocLn, line)
DeclareSciCallR1(DocLineFromVisible, DOCLINEFROMVISIBLE, DocLn, DocLn, line)
DeclareSciCallV1(SetWrapMode, SETWRAPMODE, int, mode)
//=============================================================================
//