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

Make sure to take the clipping setting into account and do show scrollbars when "clipping" is disabled.

This commit is contained in:
samhed 2015-01-22 11:37:33 +01:00
parent 9ae9fdec5c
commit 8bb048c019
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/display.js
View File

@ -127,18 +127,26 @@ var Display;
// Size change // Size change
if (vp.w !== this._fb_width || vp.h !== this._fb_height) { if (vp.w !== this._fb_width || vp.h !== this._fb_height) {
// Change width
if (this._fb_width < vp.w && cr.x2 > vp.x + this._fb_width - 1) { if (this._fb_width < vp.w && cr.x2 > vp.x + this._fb_width - 1) {
cr.x2 = vp.x + this._fb_width - 1; cr.x2 = vp.x + this._fb_width - 1;
} }
vp.w = Math.min(this._fb_width, window.innerWidth);
// Change height
if (this._fb_height < vp.h && cr.y2 > vp.y + this._fb_height - 1) { if (this._fb_height < vp.h && cr.y2 > vp.y + this._fb_height - 1) {
cr.y2 = vp.y + this._fb_height - 1; cr.y2 = vp.y + this._fb_height - 1;
} }
var max_vp_height = window.innerHeight - $D('noVNC-control-bar').scrollHeight - 5;
vp.h = Math.min(this._fb_height, max_vp_height); if (this._viewport) {
// clipping
vp.w = Math.min(this._fb_width, window.innerWidth);
var control_bar_h = $D('noVNC-control-bar').scrollHeight;
var max_vp_h = window.innerHeight - control_bar_h - 5;
vp.h = Math.min(this._fb_height, max_vp_h);
} else {
// scrollbars
vp.w = this._fb_width;
vp.h = this._fb_height;
}
var saveImg = null; var saveImg = null;
if (vp.w > 0 && vp.h > 0 && canvas.width > 0 && canvas.height > 0) { if (vp.w > 0 && vp.h > 0 && canvas.width > 0 && canvas.height > 0) {