jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't modify mouse or keyboard in view_only mode 

The UI previously didn't respect view_only in a number of cases.
This commit is contained in:
Samuel Mannehed 2016-09-01 15:39:26 +02:00
parent 301dc0e20b
commit ceb847b0e3
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/ui.js
View File

@ -1096,8 +1096,11 @@ var UI;
} else if (resizeMode === 'scale' || resizeMode === 'downscale') { } else if (resizeMode === 'scale' || resizeMode === 'downscale') {
var downscaleOnly = resizeMode === 'downscale'; var downscaleOnly = resizeMode === 'downscale';
var scaleRatio = display.autoscale(screen.w, screen.h, downscaleOnly); var scaleRatio = display.autoscale(screen.w, screen.h, downscaleOnly);
UI.rfb.get_mouse().set_scale(scaleRatio);
Util.Debug('Scaling by ' + UI.rfb.get_mouse().get_scale()); if (!UI.rfb.get_view_only()) {
UI.rfb.get_mouse().set_scale(scaleRatio);
Util.Debug('Scaling by ' + UI.rfb.get_mouse().get_scale());
}
} }
} }
}, },
@ -1513,7 +1516,7 @@ var UI;
* ------v------*/ * ------v------*/
setMouseButton: function(num) { setMouseButton: function(num) {
if (UI.rfb) { if (UI.rfb && !UI.rfb.get_view_only()) {
UI.rfb.get_mouse().set_touchButton(num); UI.rfb.get_mouse().set_touchButton(num);
} }
@ -1529,17 +1532,17 @@ var UI;
}, },
displayBlur: function() { displayBlur: function() {
if (!UI.rfb) return; if (UI.rfb && !UI.rfb.get_view_only()) {
UI.rfb.get_keyboard().set_focused(false);
UI.rfb.get_keyboard().set_focused(false); UI.rfb.get_mouse().set_focused(false);
UI.rfb.get_mouse().set_focused(false); }
}, },
displayFocus: function() { displayFocus: function() {
if (!UI.rfb) return; if (UI.rfb && !UI.rfb.get_view_only()) {
UI.rfb.get_keyboard().set_focused(true);
UI.rfb.get_keyboard().set_focused(true); UI.rfb.get_mouse().set_focused(true);
UI.rfb.get_mouse().set_focused(true); }
}, },
updateDesktopName: function(rfb, name) { updateDesktopName: function(rfb, name) {