From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 807CC9572B for ; Wed, 18 Jan 2023 14:13:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 56C2120243 for ; Wed, 18 Jan 2023 14:13:08 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 18 Jan 2023 14:13:04 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B4A38450E6 for ; Wed, 18 Jan 2023 14:13:04 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 18 Jan 2023 14:12:57 +0100 Message-Id: <20230118131303.2892050-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230118131303.2892050-1-d.csapak@proxmox.com> References: <20230118131303.2892050-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.064 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH widget-toolkit 2/2] ComboGrid: make height for the error configurable X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jan 2023 13:13:38 -0000 by introducing a errorHeight config property. This is necessary when the ComboGrid has e.g. a toolbar and we show the error in the grid body only, 100 pixels is not enough then. To solve that without hardcoding different heights, let the subclass/caller configure that also set this when the store load fails completely (was not done until now) Signed-off-by: Dominik Csapak --- src/form/ComboGrid.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/form/ComboGrid.js b/src/form/ComboGrid.js index e903223..ba3ce40 100644 --- a/src/form/ComboGrid.js +++ b/src/form/ComboGrid.js @@ -31,6 +31,7 @@ Ext.define('Proxmox.form.ComboGrid', { skipEmptyText: false, notFoundIsValid: false, deleteEmpty: false, + errorHeight: 100, }, // needed to trigger onKeyUp etc. @@ -302,8 +303,8 @@ Ext.define('Proxmox.form.ComboGrid', { picker.on('show', function() { me.store.fireEvent('refresh'); if (me.enableLoadMask) { - me.savedMinHeight = picker.getMinHeight(); - picker.setMinHeight(100); + me.savedMinHeight = me.savedMinHeight ?? picker.getMinHeight(); + picker.setMinHeight(me.errorHeight); } if (me.loadError) { Proxmox.Utils.setErrorMask(picker.getView(), me.loadError); @@ -463,7 +464,10 @@ Ext.define('Proxmox.form.ComboGrid', { } else { let msg = Proxmox.Utils.getResponseErrorMessage(o.getError()); if (me.picker) { + me.savedMinHeight = me.savedMinHeight ?? me.picker.getMinHeight(); + me.picker.setMinHeight(me.errorHeight); Proxmox.Utils.setErrorMask(me.picker.getView(), msg); + me.picker.updateLayout(); } me.loadError = msg; } -- 2.30.2