A refinement of my patch from Neil Hodgson

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

diff --git a/contrib/src/stc/scintilla/src/ScintillaBase.cxx b/contrib/src/stc/scintilla/src/ScintillaBase.cxx
index f4523cced3390109f7b6324e4b91386ce9361a1a..7958661521984f9f4e104d70cf17557ba28dd37f 100644 (file)
--- a/contrib/src/stc/scintilla/src/ScintillaBase.cxx
+++ b/contrib/src/stc/scintilla/src/ScintillaBase.cxx
@@ -251,8 +251,8 @@ 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 + vs.lineHeight >= rcClient.bottom - heightAlloced &&  // Wont fit below.
-               pt.y >= (rcClient.bottom + rcClient.top) / 2) { // and there is more room above.
+        if (((pt.y + vs.lineHeight) >= (rcClient.bottom - heightAlloced)) &&  // Wont fit below.
+            ((pt.y + vs.lineHeight / 2) >= (rcClient.bottom + rcClient.top) / 2)) { // and there is more room above.
                rcList.top = pt.y - heightAlloced;
        } else {
                rcList.top = pt.y + vs.lineHeight;

diff --git a/src/stc/scintilla/src/ScintillaBase.cxx b/src/stc/scintilla/src/ScintillaBase.cxx
index f4523cced3390109f7b6324e4b91386ce9361a1a..7958661521984f9f4e104d70cf17557ba28dd37f 100644 (file)
--- a/src/stc/scintilla/src/ScintillaBase.cxx
+++ b/src/stc/scintilla/src/ScintillaBase.cxx
@@ -251,8 +251,8 @@ 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 + vs.lineHeight >= rcClient.bottom - heightAlloced &&  // Wont fit below.
-               pt.y >= (rcClient.bottom + rcClient.top) / 2) { // and there is more room above.
+        if (((pt.y + vs.lineHeight) >= (rcClient.bottom - heightAlloced)) &&  // Wont fit below.
+            ((pt.y + vs.lineHeight / 2) >= (rcClient.bottom + rcClient.top) / 2)) { // and there is more room above.
                rcList.top = pt.y - heightAlloced;
        } else {
                rcList.top = pt.y + vs.lineHeight;