Merge branch 'dev'

qui/controls/buttons/Select.js

@@ -1129,6 +1129,8 @@ define('qui/controls/buttons/Select', [
                             return !Child.isHidden();
                         });
 
+                        self.$Menu.resize();
+
                         if (!displayedOne) {
                             self.$Menu.hide();
                             return;

qui/controls/contextmenu/Menu.js

@@ -247,6 +247,29 @@ define('qui/controls/contextmenu/Menu', [
             return this.$hidden;
         },
 
+        /**
+         * resize the menu
+         */
+        resize: function () {
+            var Elm        = this.getElm(),
+                scrollSize = Elm.getScrollSize();
+
+            var height        = scrollSize.y + 5;
+            var childrenSizes = this.getElm().getElements('.qui-contextitem').map(function (Node) {
+                return Node.getSize().y;
+            });
+
+            var sum = childrenSizes.reduce(function (pv, cv) {
+                return pv + cv;
+            }, 0);
+
+            if (sum < height) {
+                height = sum;
+            }
+
+            this.$Container.setStyle('height', height);
+        },
+
         /**
          * refresh the menu
          */