From 4e321789b19612634a5145a3783192555425529f Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Wed, 30 Aug 2017 09:31:32 +0300
Subject: [PATCH] documentation popup size fix #233

---
 dub.json                      |  2 +-
 src/dlangide/ui/dsourceedit.d | 16 ++++++++++++----
 views/VERSION                 |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/dub.json b/dub.json
index ad4cc73..22e1d92 100644
--- a/dub.json
+++ b/dub.json
@@ -12,7 +12,7 @@
     "stringImportPaths": ["views", "views/res", "views/res/i18n", "views/res/mdpi", "views/res/hdpi"],
 
     "dependencies": {
-        "dlangui": "==0.9.102",
+        "dlangui": "==0.9.103",
         "dcd": "~>0.9.1"
     },
 
diff --git a/src/dlangide/ui/dsourceedit.d b/src/dlangide/ui/dsourceedit.d
index fbdeb66..86530dd 100644
--- a/src/dlangide/ui/dsourceedit.d
+++ b/src/dlangide/ui/dsourceedit.d
@@ -504,17 +504,25 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
             lineCount = 1;
         // TODO
         EditBox widget = new EditBox("docComments");
+        widget.styleId = "POPUP_MENU";
         widget.readOnly = true;
         //TextWidget widget = new TextWidget("docComments");
         //widget.maxLines = lineCount * 2;
         //widget.text = "Test popup"d; //text.dup;
         widget.text = text.dup;
+
+        Point bestSize = widget.fullContentSizeWithBorders();
         //widget.layoutHeight = lineCount * widget.fontSize;
-        widget.minHeight = (lineCount + 1) * widget.fontSize;
-        widget.maxWidth = width * 3 / 4;
-        widget.minWidth = width / 8;
+        if (bestSize.y > height / 3)
+            bestSize.y = height / 3;
+        if (bestSize.x > width * 3 / 4)
+            bestSize.x = width * 3 / 4;
+        widget.minHeight = bestSize.y; //max((lineCount + 1) * widget.fontSize, bestSize.y);
+        widget.maxHeight = bestSize.y;
+
+        widget.maxWidth = bestSize.x; //width * 3 / 4;
+        widget.minWidth = bestSize.x; //width / 8;
        // widget.layoutWidth = width / 3;
-        widget.styleId = "POPUP_MENU";
         widget.hscrollbarMode = ScrollBarMode.Auto;
         widget.vscrollbarMode = ScrollBarMode.Auto;
         uint pos = PopupAlign.Above;
diff --git a/views/VERSION b/views/VERSION
index d5409c4..4f3713f 100644
--- a/views/VERSION
+++ b/views/VERSION
@@ -1 +1 @@
-v0.7.59
\ No newline at end of file
+v0.7.60
\ No newline at end of file