force dropdown width

entrylabs · May 24, 2016 · 2cf562a · 2cf562a
1 parent 6f9179f
commit 2cf562a
Show file tree

Hide file tree

Showing 6 changed files with 98 additions and 84 deletions.
diff --git a/dist/entry.css b/dist/entry.css
@@ -604,7 +604,7 @@ svg .svgBlockGroup text {
 }
 .entry-widget-dropdown .rect {
   height: 20px;
-  padding: 3px 19px 3px 6px;
+  padding: 3px 17px 3px 6px;
   width: 100%;
 }
 .entry-widget-dropdown .rect .left {

diff --git a/dist/entry.js b/dist/entry.js
diff --git a/dist/entry.min.js b/dist/entry.min.js
diff --git a/src/css/components/block.less b/src/css/components/block.less
@@ -152,7 +152,7 @@ svg .svgBlockGroup text {
 
     .rect {
         height: 20px;
-        padding: 3px 19px 3px 6px;
+        padding: 3px 17px 3px 6px;
         width: 100%;
 
         .left {

diff --git a/src/workspace/field/dropdown.js b/src/workspace/field/dropdown.js
@@ -183,33 +183,38 @@ Entry.Utils.inherit(Entry.Field, Entry.FieldDropdown);
                 });
             })(element, value);
         }
-
+        this._position(true);
+        this.optionGroup.css('width', this.optionGroup.width() + 3);
         this._position();
     };
 
-    p._position = function() {
-        //inspect enough space below
-        var pos = this.getAbsolutePosFromDocument();
-        pos.y += this.box.height/2;
+    p._position = function(reset) {
+        if (!reset) {
+            //inspect enough space below
+            var pos = this.getAbsolutePosFromDocument();
+            pos.y += this.box.height/2;
 
-        var documentHeight = $(document).height();
-        var optionGroupHeight = this.optionGroup.height();
+            var documentHeight = $(document).height();
+            var optionGroupHeight = this.optionGroup.height();
 
-        //not enough space below
-        if (documentHeight < pos.y + optionGroupHeight) {
-            pos.x += this.box.width + 1;
+            //not enough space below
+            if (documentHeight < pos.y + optionGroupHeight) {
+                pos.x += this.box.width + 1;
 
-            var relPos = this.getAbsolutePosFromBoard();
-            var domHeight = this._blockView.getBoard().svgDom.height();
-            domHeight -=  domHeight - relPos.y;
+                var relPos = this.getAbsolutePosFromBoard();
+                var domHeight = this._blockView.getBoard().svgDom.height();
+                domHeight -=  domHeight - relPos.y;
 
-            if (domHeight - 20 < optionGroupHeight) {
-                domHeight -= domHeight % 20;
-                this.optionGroup.height(domHeight)
-            }
+                if (domHeight - 20 < optionGroupHeight) {
+                    domHeight -= domHeight % 20;
+                    this.optionGroup.height(domHeight)
+                }
 
-            pos.y -= this.optionGroup.height();
-        } else pos.x += this.box.width/2 - this.optionGroup.width()/2;
+                pos.y -= this.optionGroup.height();
+            } else pos.x += this.box.width/2 - this.optionGroup.width()/2;
+        } else {
+            pos = { x: 0, y: 0 };
+        }
 
         this.optionGroup.css({left: pos.x, top: pos.y});
     };

diff --git a/src/workspace/field/dropdownDynamic.js b/src/workspace/field/dropdownDynamic.js
@@ -125,7 +125,8 @@ Entry.Utils.inherit(Entry.FieldDropdown, Entry.FieldDropdownDynamic);
                 });
             })(element, value);
         }
-
+        this._position(true);
+        this.optionGroup.css('width', this.optionGroup.width() +3);
         this._position();
     };