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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id C16F2607BD for ; Thu, 13 Jan 2022 08:57:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B1EA11A98E for ; Thu, 13 Jan 2022 08:56:35 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 882E81A982 for ; Thu, 13 Jan 2022 08:56:34 +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 218B946029 for ; Thu, 13 Jan 2022 08:56:34 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 13 Jan 2022 08:56:33 +0100 Message-Id: <20220113075633.473258-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.163 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 manager] add 'auto' mode for noVNC scaling 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: Thu, 13 Jan 2022 07:57:05 -0000 in commit 69c6561f820b4fdb5625ead767889155db9f1539 ("ui: fix novnc scaling radio button") we always set to 'scale' when no value was set, but a non-set value actually had a different behaviour: in the embedded console it was set to 'scale', but in the pop-up it was set to 'off'. to restore this behaviour, introduce an option 'auto' which unsets the 'novnc-scaling' setting Signed-off-by: Dominik Csapak --- www/manager6/window/Settings.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/www/manager6/window/Settings.js b/www/manager6/window/Settings.js index b151adcd..5cf7a70f 100644 --- a/www/manager6/window/Settings.js +++ b/www/manager6/window/Settings.js @@ -34,7 +34,7 @@ Ext.define('PVE.window.Settings', { var username = sp.get('login-username') || Proxmox.Utils.noneText; me.lookupReference('savedUserName').setValue(Ext.String.htmlEncode(username)); - var vncMode = sp.get('novnc-scaling') || 'scale'; + var vncMode = sp.get('novnc-scaling') || 'auto'; me.lookupReference('noVNCScalingGroup').setValue({ noVNCScalingField: vncMode }); let summarycolumns = sp.get('summarycolumns', 'auto'); @@ -372,11 +372,18 @@ Ext.define('PVE.window.Settings', { type: 'hbox', }, items: [ + { + xtype: 'radiofield', + name: 'noVNCScalingField', + inputValue: 'auto', + boxLabel: 'Auto', + }, { xtype: 'radiofield', name: 'noVNCScalingField', inputValue: 'scale', boxLabel: 'Local Scaling', + margin: '0 0 0 10', }, { xtype: 'radiofield', name: 'noVNCScalingField', @@ -387,7 +394,12 @@ Ext.define('PVE.window.Settings', { ], listeners: { change: function(el, { noVNCScalingField }) { - Ext.state.Manager.getProvider().set('novnc-scaling', noVNCScalingField); + let provider = Ext.state.Manager.getProvider(); + if (noVNCScalingField === 'auto') { + provider.clear('novnc-scaling'); + } else { + provider.set('novnc-scaling', noVNCScalingField); + } }, }, }, -- 2.30.2