all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager] add 'auto' mode for noVNC scaling
Date: Thu, 13 Jan 2022 08:56:33 +0100	[thread overview]
Message-ID: <20220113075633.473258-1-d.csapak@proxmox.com> (raw)

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 <d.csapak@proxmox.com>
---
 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





             reply	other threads:[~2022-01-13  7:57 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-13  7:56 Dominik Csapak [this message]
2022-01-13 12:03 ` [pve-devel] applied: " Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220113075633.473258-1-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal