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 08685729F6 for ; Wed, 26 May 2021 10:58:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 71703E46C for ; Wed, 26 May 2021 10:58:46 +0200 (CEST) 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 id 4E5B6E2D6 for ; Wed, 26 May 2021 10:58:41 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 28CF345A88 for ; Wed, 26 May 2021 10:58:41 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 26 May 2021 10:58:33 +0200 Message-Id: <20210526085839.9808-6-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210526085839.9808-1-d.csapak@proxmox.com> References: <20210526085839.9808-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.038 Adjusted score from AWL reputation of From: address 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 05/11] panel/RRDChart: fix legend/undoZoom 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, 26 May 2021 08:58:47 -0000 the legend is by default of type 'sprite', rever to 'dom' but we now have to unset the '.legend', else on destruction extjs tries to destroy it twice also change the onAfterAnimation listener to 'redraw', since the original event does not exist anymore, add a buffer to it so that it is not that heavy Signed-off-by: Dominik Csapak --- src/css/ext6-pmx.css | 5 +++++ src/panel/RRDChart.js | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/css/ext6-pmx.css b/src/css/ext6-pmx.css index 7cedaa9..0c83d8a 100644 --- a/src/css/ext6-pmx.css +++ b/src/css/ext6-pmx.css @@ -122,3 +122,8 @@ div.right-aligned { .x-treelist-pve-nav { background-color: #f5f5f5; } + +/* fix padding for legend in header */ +.x-legend-inner { + padding: 0; +} diff --git a/src/panel/RRDChart.js b/src/panel/RRDChart.js index 49b3ad2..859cb39 100644 --- a/src/panel/RRDChart.js +++ b/src/panel/RRDChart.js @@ -121,6 +121,9 @@ Ext.define('Proxmox.widget.RRDChart', { }, onAfterAnimation: function(chart, eopts) { + if (!chart.header || !chart.header.tools) { + return; + } // if the undo button is disabled, disable our tool let ourUndoZoomButton = chart.header.tools[0]; let undoButton = chart.interactions[0].getUndoButton(); @@ -137,10 +140,16 @@ Ext.define('Proxmox.widget.RRDChart', { }, ], legend: { + type: 'dom', padding: 0, }, listeners: { - animationend: 'onAfterAnimation', + redraw: { + fn: 'onAfterAnimation', + options: { + buffer: 500, + }, + }, }, constructor: function(config) { @@ -200,6 +209,7 @@ Ext.define('Proxmox.widget.RRDChart', { if (me.header && me.legend) { me.header.padding = '4 9 4'; me.header.add(me.legend); + me.legend = undefined; } if (!me.noTool) { -- 2.20.1