diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-07-17 15:29:06 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-07-17 15:29:06 +1000 |
| commit | 5d2ed951076535f28ba68fbb9968dad911fffaa5 (patch) | |
| tree | 6bad0b61bdb3419c1e8d2c6a480db18324a2e9cf /win32/ScintillaWin.cxx | |
| parent | 91d2e95542ee6a908b0adf46d420c1696ae31a9d (diff) | |
| download | scintilla-mirror-5d2ed951076535f28ba68fbb9968dad911fffaa5.tar.gz | |
Backport: Bug [#2120]. Avoid candidate window obscuring text when near bottom of screen.
Feature [feature-requests:#1300] part 1.
Backport of changeset 7683:b99264d451e3.
Diffstat (limited to 'win32/ScintillaWin.cxx')
| -rw-r--r-- | win32/ScintillaWin.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index ebfe89ad4..232d00442 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -943,11 +943,17 @@ void ScintillaWin::SetCandidateWindowPos() { IMContext imc(MainHWND()); if (imc.hIMC) { const Point pos = PointMainCaret(); - CANDIDATEFORM CandForm; + const PRectangle rcClient = GetTextRectangle(); + CANDIDATEFORM CandForm{}; CandForm.dwIndex = 0; - CandForm.dwStyle = CFS_CANDIDATEPOS; + CandForm.dwStyle = CFS_EXCLUDE; CandForm.ptCurrentPos.x = static_cast<int>(pos.x); CandForm.ptCurrentPos.y = static_cast<int>(pos.y + vs.lineHeight); + // Exclude the area of the whole caret line + CandForm.rcArea.top = static_cast<int>(pos.y); + CandForm.rcArea.bottom = static_cast<int>(pos.y + vs.lineHeight); + CandForm.rcArea.left = static_cast<int>(rcClient.left); + CandForm.rcArea.right = static_cast<int>(rcClient.right); ::ImmSetCandidateWindow(imc.hIMC, &CandForm); } } |