ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix: More correct scaling (with padding) during live viewing

pull/3855/head
IgorA100 2024-03-07 13:30:39 +03:00 committed by GitHub
parent f0088e49d7
commit e90340dd2b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/skins/classic/js/skin.js
View File

@ -619,15 +619,12 @@ function scaleToFit(baseWidth, baseHeight, scaleEl, bottomEl, container) {
newWidth -= padding;
newHeight = newWidth / ratio ;
console.log("newWidth = ", newWidth, "container width:", container.innerWidth());
console.log("newWidth = ", newWidth, "container width:", container.innerWidth()-padding);
if (newHeight < 0) {
if (newHeight < 0 || newWidth > container.innerWidth()-padding){
// Doesn't fit on screen anyways?
newWidth = container.innerWidth()-padding;
newHeight = newWidth / ratio;
} else if (newWidth > container.innerWidth()) {
newWidth = container.innerWidth()-padding;
newHeight = newWidth / ratio;
}
console.log("newWidth = " + newWidth);
var autoScale = Math.round(newWidth / baseWidth * SCALE_BASE);