new helper Proxmox.Utils.compute_min_label_width()

diff --git a/Utils.js b/Utils.js
index a41fbc6ee2d3ad54c96f7346cadd8f382ba19c3a..1aff39f64f33fde078a62c8463fea8cfee5b6888 100644 (file)
--- a/Utils.js
+++ b/Utils.js
@@ -79,6 +79,16 @@ Ext.define('Proxmox.Utils', { utilities: {
        return value ? Proxmox.Utils.enabledText : Proxmox.Utils.disabledText;
     },
 
+    compute_min_label_width: function(text, width) {
+
+       if (width === undefined) { width = 100; }
+
+       var tm = new Ext.util.TextMetrics();
+       var min = tm.getWidth(text + ':');
+
+       return min < width ? width : min;
+    },
+
     authOK: function() {
        return (Proxmox.UserName !== '') && Ext.util.Cookies.get(Proxmox.Setup.auth_cookie_name);
     },

diff --git a/grid/ObjectGrid.js b/grid/ObjectGrid.js
index 743532dbec024b4f240af52c79ef4a014535f711..0808727c4919532162251aa09a21d3910582598d 100644 (file)
--- a/grid/ObjectGrid.js
+++ b/grid/ObjectGrid.js
@@ -29,8 +29,6 @@ Ext.define('Proxmox.grid.ObjectGrid', {
 
        opts = opts || {};
 
-       var tm = new Ext.util.TextMetrics();
-
        me.rows[name] = {
            required: true,
            defaultValue: opts.defaultValue || 0,
@@ -46,7 +44,8 @@ Ext.define('Proxmox.grid.ObjectGrid', {
                    defaultValue: opts.defaultValue  || 0,
                    checked: opts.defaultValue ? true : false,
                    deleteDefaultValue: opts.deleteDefaultValue ? true : false,
-                   labelWidth: opts.labelWidth || tm.getWidth(text + ':'),
+                   labelWidth: Proxmox.Utils.compute_min_label_width(
+                       text, opts.labelWidth),
                    fieldLabel: text
                }
            }
@@ -58,8 +57,6 @@ Ext.define('Proxmox.grid.ObjectGrid', {
 
        opts = opts || {}
 
-       var tm = new Ext.util.TextMetrics();
-
        me.rows[name] = {
            required: true,
            defaultValue: opts.defaultValue,
@@ -75,7 +72,8 @@ Ext.define('Proxmox.grid.ObjectGrid', {
                    emptyText: gettext('Default'),
                    deleteEmpty: true,
                    value: opts.defaultValue,
-                   labelWidth: opts.labelWidth || tm.getWidth(text + ':'),
+                   labelWidth: Proxmox.Utils.compute_min_label_width(
+                       text, opts.labelWidth),
                    fieldLabel: text
                }
            }