mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-15 18:14:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

When auto scaling, if we get a negative new height, just make it 100% width

Browse Source
This commit is contained in:
Isaac Connor
2023-01-20 14:12:02 -05:00
parent 9479ccae8f
commit 39f2fa5fbb
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -590,8 +590,8 @@ function endOfResize(e) {
* */
function scaleToFit(baseWidth, baseHeight, scaleEl, bottomEl) {
$j(window).on('resize', endOfResize); //set delayed scaling when Scale to Fit is selected
var ratio = baseWidth / baseHeight;
var container = $j('#content');
const ratio = baseWidth / baseHeight;
const container = $j('#content');
if (!container) {
console.error("No container found");
return;
@@ -600,16 +600,20 @@ function scaleToFit(baseWidth, baseHeight, scaleEl, bottomEl) {
if (!bottomEl || !bottomEl.length) {
bottomEl = $j(container[0].lastElementChild);
}
var viewPort = $j(window);
const viewPort = $j(window);
// jquery does not provide a bottom offset, and offset does not include margins. outerHeight true minus false gives total vertical margins.
var bottomLoc = bottomEl.offset().top + (bottomEl.outerHeight(true) - bottomEl.outerHeight()) + bottomEl.outerHeight(true);
console.log("bottomLoc: " + bottomEl.offset().top + " + (" + bottomEl.outerHeight(true) + ' - ' + bottomEl.outerHeight() +') + '+bottomEl.outerHeight(true) + '='+bottomLoc);
var newHeight = viewPort.height() - (bottomLoc - scaleEl.outerHeight(true));
console.log("newHeight = " + viewPort.height() +" - " + bottomLoc + ' - ' + scaleEl.outerHeight(true)+'='+newHeight);
var newWidth = ratio * newHeight;
console.log("newWidth = " + newWidth);
if (newWidth > container.innerWidth()) {
if (newHeight < 0) {
// Doesn't fit on screen anyways?
newWidth = container.innerWidth();
newHeight = newWidth / ratio;
} else if (newWidth > container.innerWidth()) {
newWidth = container.innerWidth();
newHeight = newWidth / ratio;
}