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 72D9E96F48 for ; Fri, 27 Jan 2023 11:14:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 561206C94 for ; Fri, 27 Jan 2023 11:14:38 +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 ; Fri, 27 Jan 2023 11:14:37 +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 6EEF544686 for ; Fri, 27 Jan 2023 11:14:37 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Fri, 27 Jan 2023 11:14:36 +0100 Message-Id: <20230127101436.2200018-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230127101436.2200018-1-d.csapak@proxmox.com> References: <20230127101436.2200018-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -1.237 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% ENA_SUBJ_ODD_CASE 2.6 Subject has odd case 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 manager 1/1] ui: ComboBoxSetStoreNode: don't hide the picker when clicking the toolbar 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: Fri, 27 Jan 2023 10:14:38 -0000 When clicking the toolbar of the ComboGrid, the combobox loses focus, and instantly hides the picker. To prevent that, we keep track of the mousedown event on the toolbar (which happily comes before the focusLeave event), and prevent the focusLeave propagation in that case. Then on mouseup, we focus the combobox again, so that the nexct focusLeave can trigger again. Signed-off-by: Dominik Csapak --- www/manager6/form/ComboBoxSetStoreNode.js | 30 +++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/www/manager6/form/ComboBoxSetStoreNode.js b/www/manager6/form/ComboBoxSetStoreNode.js index a654636b7..a127af3a5 100644 --- a/www/manager6/form/ComboBoxSetStoreNode.js +++ b/www/manager6/form/ComboBoxSetStoreNode.js @@ -29,6 +29,30 @@ Ext.define('PVE.form.ComboBoxSetStoreNode', { me.fireEvent('nodechanged', value); }, + tbarMouseDown: function() { + this.mousePressed = true; + }, + + tbarMouseUp: function() { + let me = this; + delete this.mousePressed; + if (me.focusLeft) { + me.focus(); + delete me.focusLeft; + } + }, + + // conditionally prevent the focusLeave handler to continue, preventing collapsing of the picker + onFocusLeave: function() { + let me = this; + me.focusLeft = true; + if (!me.mousePressed) { + me.callParent(arguments); + } + + return undefined; + }, + initComponent: function() { let me = this; @@ -37,6 +61,12 @@ Ext.define('PVE.form.ComboBoxSetStoreNode', { Ext.apply(me.listConfig ?? {}, { tbar: { xtype: 'toolbar', + listeners: { + mousedown: me.tbarMouseDown, + mouseup: me.tbarMouseUp, + element: 'el', + scope: me, + }, items: [ { xtype: "pveStorageScanNodeSelector", -- 2.30.2