forks
/
dlangide
mirror of https://github.com/buggins/dlangide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

autocompletion list popup size and location fix; for #304

This commit is contained in:
Vadim Lopatin 2017-09-22 13:54:59 +03:00
parent d1144ac3f5
commit 732044c229
1 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/dlangide/ui/dsourceedit.d
View File

@ -633,10 +633,37 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
dstring prefix = identPrefixUnderCursor(); dstring prefix = identPrefixUnderCursor();
_completionPopupMenu = new CompletionPopupMenu(this, suggestions, icons, prefix); _completionPopupMenu = new CompletionPopupMenu(this, suggestions, icons, prefix);
int yOffset = font.height; int yOffset = font.height;
_completionPopup = window.showPopup(_completionPopupMenu, this, PopupAlign.Point | PopupAlign.Right, int popupPositionX = textPosToClient(_caretPos).left + left + _leftPaneWidth;
textPosToClient(_caretPos).left + left + _leftPaneWidth, int popupPositionY = textPosToClient(_caretPos).top + top + margins.top;
textPosToClient(_caretPos).top + top + margins.top + yOffset); uint popupAlign = PopupAlign.Point | PopupAlign.Right;
int spaceBelow = window.mainWidget.pos.bottom - (popupPositionY + yOffset);
int spaceAbove = popupPositionY - clientRect.top;
int space = spaceBelow;
if (spaceBelow < clientRect.height / 4) {
// show popup above
space = spaceAbove;
popupAlign |= PopupAlign.Above;
yOffset = 0;
}
Point bestSize = _completionPopupMenu.fullContentSizeWithBorders();
if (bestSize.y > space) {
bestSize.y = space;
}
if (bestSize.x > width * 3 / 4) {
bestSize.x = width * 3 / 4;
}
_completionPopupMenu.minHeight = bestSize.y; //max((lineCount + 1) * widget.fontSize, bestSize.y);
_completionPopupMenu.maxHeight = bestSize.y;
_completionPopupMenu.maxWidth = bestSize.x; //width * 3 / 4;
_completionPopupMenu.minWidth = bestSize.x; //width / 8;
_completionPopup = window.showPopup(_completionPopupMenu, this, popupAlign,
popupPositionX,
popupPositionY + yOffset);
_completionPopup.setFocus(); _completionPopup.setFocus();
_completionPopup.popupClosed = delegate(PopupWidget source) { _completionPopup.popupClosed = delegate(PopupWidget source) {
setFocus(); setFocus();
@ -644,7 +671,7 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
}; };
_completionPopup.flags = PopupFlags.CloseOnClickOutside; _completionPopup.flags = PopupFlags.CloseOnClickOutside;
Log.d("Showing popup at ", textPosToClient(_caretPos).left, " ", textPosToClient(_caretPos).top); debug Log.d("Showing popup at ", textPosToClient(_caretPos).left, " ", textPosToClient(_caretPos).top);
window.update(); window.update();
} }
@ -730,9 +757,22 @@ class CompletionPopupMenu : PopupMenu {
_items = updateItems(); _items = updateItems();
super(_items); super(_items);
menuItemAction = _editor; menuItemAction = _editor;
maxHeight(400); //maxHeight(400);
selectItem(0); selectItem(0);
} }
Point fullContentSizeWithBorders() {
measure(2000.pointsToPixels, 2000.pointsToPixels);
Point sz;
sz.x = measuredWidth;
sz.y = measuredHeight;
Rect pad = padding;
Rect marg = margins;
sz.x += pad.left + pad.right + marg.left + marg.right;
sz.y += pad.top + pad.bottom + marg.top + marg.bottom;
return sz;
}
MenuItem updateItems() { MenuItem updateItems() {
MenuItem res = new MenuItem(); MenuItem res = new MenuItem();
foreach(int i, dstring suggestion ; _suggestions) { foreach(int i, dstring suggestion ; _suggestions) {