Merge pull request #296 from entrylabs/issue/dropdown_width_force

force dropdown width
entrylabs · May 25, 2016 · b334ff3 · b334ff3
2 parents 6c35c2c + b697daa
commit b334ff3
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/dist/entry.css b/dist/entry.css
@@ -601,10 +601,12 @@ svg .svgBlockGroup text {
   color: #000;
   z-index: 1001;
   overflow: auto;
+  left: 0;
+  top: 0;
 }
 .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
@@ -16855,7 +16855,7 @@ Entry.Utils.inherit(Entry.Field, Entry.FieldDropdown);
     } else {
       a.x += this.box.width / 2 - this.optionGroup.width() / 2;
     }
-    this.optionGroup.css({left:a.x, top:a.y});
+    this.optionGroup.css({left:a.x, top:a.y, width:this.optionGroup.width() + 3});
   };
   b.applyValue = function(a) {
     this.value != a && this.setValue(a);

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
@@ -149,10 +149,12 @@ svg .svgBlockGroup text {
     color: #000;
     z-index: 1001;
     overflow: auto;
+    left: 0;
+    top: 0;
 
     .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,7 +183,6 @@ Entry.Utils.inherit(Entry.Field, Entry.FieldDropdown);
                 });
             })(element, value);
         }
-
         this._position();
     };
 
@@ -211,7 +210,10 @@ Entry.Utils.inherit(Entry.Field, Entry.FieldDropdown);
             pos.y -= this.optionGroup.height();
         } else pos.x += this.box.width/2 - this.optionGroup.width()/2;
 
-        this.optionGroup.css({left: pos.x, top: pos.y});
+        this.optionGroup.css({
+            left: pos.x, top: pos.y,
+            width: this.optionGroup.width() + 3
+        });
     };
 
     p.applyValue = function(value) {

diff --git a/src/workspace/field/dropdownDynamic.js b/src/workspace/field/dropdownDynamic.js
@@ -125,7 +125,6 @@ Entry.Utils.inherit(Entry.FieldDropdown, Entry.FieldDropdownDynamic);
                 });
             })(element, value);
         }
-
         this._position();
     };
-Original file line number
+Diff line change
@@ Expand Up @@
                     });
                 })(element, value);
             }
             this._position();
         };
@@ Expand Down @@