Better placement of the AutoComplete listbox

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/stc/scintilla/src/ScintillaBase.cxx b/contrib/src/stc/scintilla/src/ScintillaBase.cxx
index 1238e2ecb20b0f485cd23fd6fbaf8d132444c78c..f4523cced3390109f7b6324e4b91386ce9361a1a 100644 (file)
--- 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]);
        }
        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);
                // 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;
        // 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 {
                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 1238e2ecb20b0f485cd23fd6fbaf8d132444c78c..f4523cced3390109f7b6324e4b91386ce9361a1a 100644 (file)
--- 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]);
        }
        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);
                // 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;
        // 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 {
                pt.y >= (rcClient.bottom + rcClient.top) / 2) { // and there is more room above.
                rcList.top = pt.y - heightAlloced;
        } else {