From 27813df1f79323884ce5e3ec9a730f5d3da03f95 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 7 Sep 2002 21:56:28 +0000 Subject: [PATCH] Better placement of the AutoComplete listbox git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/stc/scintilla/src/ScintillaBase.cxx | 4 ++-- src/stc/scintilla/src/ScintillaBase.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/src/stc/scintilla/src/ScintillaBase.cxx b/contrib/src/stc/scintilla/src/ScintillaBase.cxx index 1238e2ecb2..f4523cced3 100644 --- a/contrib/src/stc/scintilla/src/ScintillaBase.cxx +++ b/contrib/src/stc/scintilla/src/ScintillaBase.cxx @@ -70,7 +70,7 @@ void ScintillaBase::AddCharUTF(char *s, unsigned int len, bool treatAsDBCS) { } if (ac.Active()) { AutoCompleteChanged(s[0]); - // For fill ups add the character after the autocompletion has + // For fill ups add the character after the autocompletion has // triggered so containers see the key so can display a calltip. if (isFillUp) { Editor::AddCharUTF(s, len, treatAsDBCS); @@ -251,7 +251,7 @@ void ScintillaBase::AutoCompleteStart(int lenEntered, const char *list) { // Make an allowance for large strings in list rcList.left = pt.x - 5; rcList.right = rcList.left + widthLB; - if (pt.y >= rcClient.bottom - heightLB && // Wont fit below. + if (pt.y + vs.lineHeight >= rcClient.bottom - heightAlloced && // Wont fit below. pt.y >= (rcClient.bottom + rcClient.top) / 2) { // and there is more room above. rcList.top = pt.y - heightAlloced; } else { diff --git a/src/stc/scintilla/src/ScintillaBase.cxx b/src/stc/scintilla/src/ScintillaBase.cxx index 1238e2ecb2..f4523cced3 100644 --- a/src/stc/scintilla/src/ScintillaBase.cxx +++ b/src/stc/scintilla/src/ScintillaBase.cxx @@ -70,7 +70,7 @@ void ScintillaBase::AddCharUTF(char *s, unsigned int len, bool treatAsDBCS) { } if (ac.Active()) { AutoCompleteChanged(s[0]); - // For fill ups add the character after the autocompletion has + // For fill ups add the character after the autocompletion has // triggered so containers see the key so can display a calltip. if (isFillUp) { Editor::AddCharUTF(s, len, treatAsDBCS); @@ -251,7 +251,7 @@ void ScintillaBase::AutoCompleteStart(int lenEntered, const char *list) { // Make an allowance for large strings in list rcList.left = pt.x - 5; rcList.right = rcList.left + widthLB; - if (pt.y >= rcClient.bottom - heightLB && // Wont fit below. + if (pt.y + vs.lineHeight >= rcClient.bottom - heightAlloced && // Wont fit below. pt.y >= (rcClient.bottom + rcClient.top) / 2) { // and there is more room above. rcList.top = pt.y - heightAlloced; } else { -- 2.45.2