Patch from Blair McGlashan for autocompletion on Windows to

* Set maximum width of list
* set maximum height of list
* better calculate width
* use ellipsis when text is truncated to fit window
* use popup window so it can extend past parent window
* disallow resizing too small
* draw to bottom edge when resized so last item not full line high
* improve time to display by by 90%
Minor tweaks by me to fix warnings, layout etc.

2 files changed, 19 insertions, 1 deletions

diff --git a/include/Scintilla.h b/include/Scintilla.h
index 5e5528c0a..6267496b0 100644
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -255,6 +255,10 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_CLEARREGISTEREDIMAGES 2408
 #define SCI_AUTOCGETTYPESEPARATOR 2285
 #define SCI_AUTOCSETTYPESEPARATOR 2286
+#define SCI_AUTOCSETMAXWIDTH 2208
+#define SCI_AUTOCGETMAXWIDTH 2209
+#define SCI_AUTOCSETMAXHEIGHT 2210
+#define SCI_AUTOCGETMAXHEIGHT 2211
 #define SCI_SETINDENT 2122
 #define SCI_GETINDENT 2123
 #define SCI_SETUSETABS 2124
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index b7e64ed17..ea72a73ca 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -607,6 +607,20 @@ get int AutoCGetTypeSeparator=2285(,)
 # Default is '?' but can be changed if items contain '?'.
 set void AutoCSetTypeSeparator=2286(int separatorCharacter,)
 
+# Set the maximum width, in characters, of auto-completion and user lists. 
+# Set to 0 to autosize to fit longest item, which is the default.
+set void AutoCSetMaxWidth=2208(int characterCount,)
+
+# Get the maximum width, in characters, of auto-completion and user lists. 
+get int AutoCGetMaxWidth=2209(,)
+
+# Set the maximum height, in rows, of auto-completion and user lists.
+# The default is 5 rows.
+set void AutoCSetMaxHeight=2210(int rowCount,)
+
+# Set the maximum height, in rows, of auto-completion and user lists.
+get int AutoCGetMaxHeight=2211(,)
+
 # Set the number of spaces used for one level of indentation.
 set void SetIndent=2122(int indentSize,)
 
@@ -1599,7 +1613,7 @@ fun void SetLengthForEncode=2448(int bytes,)
 # On error return 0.
 fun int EncodedFromUTF8=2449(string utf8, stringresult encoded)
 
-# Find the position of a column on a line taking into account tabs and
+# Find the position of a column on a line taking into account tabs and 
 # multi-byte characters. If beyond end of line, return line end position.
 fun int FindColumn=2456(int line, int column)