diff options
| author | Pliable Pixels <pliablepixels@users.noreply.github.com> | 2020-09-15 09:06:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-15 09:06:25 -0400 |
| commit | ae576a8a6f393f29c5656190694ea8422a6ef101 (patch) | |
| tree | ba399fd324d5b0a64415834b348f927d7e5362c2 | |
| parent | 69a9c8eabe059145f8a0599a44df2b6897ac3180 (diff) | |
| parent | 78a9cc8e6c4c2206fb7ba5d035ceed7279fd5a85 (diff) | |
Merge pull request #980 from lucasnz/master
large thumbs were being cropped a touch
| -rw-r--r-- | www/js/EventCtrl.js | 17 | ||||
| -rw-r--r-- | www/templates/events.html | 3 |
2 files changed, 12 insertions, 8 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 64d2e724..4e1417f7 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -3389,27 +3389,30 @@ angular.module('zmApp.controllers') } var ld = NVR.getLogin(); var landscape = ($rootScope.devWidth > $rootScope.devHeight) ? true:false; - var maxRowHeight; + var maxThumbHeight; + var maxThumbWidth; if (ld.eventViewThumbsSize == 'large') { - maxRowHeight = Math.min(0.7* $rootScope.devHeight, 450); + maxThumbHeight = Math.min(0.7* $rootScope.devHeight, 450); + maxThumbWidth = Math.min(0.95* $rootScope.devWidth, $rootScope.devWidth - 44); if (landscape) { // go till 90% of width in large landscape, but restricted to useable row height - return calculateAspectRatioFit(mw, mh, 0.95* $rootScope.devWidth, maxRowHeight); + return calculateAspectRatioFit(mw, mh, maxThumbWidth, maxThumbHeight); } else { // go till 80% of width in large portrait, but restricted to useable row height - return calculateAspectRatioFit(mw, mh, 0.95* $rootScope.devWidth, maxRowHeight); + return calculateAspectRatioFit(mw, mh, maxThumbWidth, maxThumbHeight); } } else { // small - maxRowHeight = 250; + maxThumbHeight = 250; + maxThumbWidth = 0.5* $rootScope.devWidth; if (landscape) { // go till 50% of width in small landscape, but restricted to useable row height - return calculateAspectRatioFit(mw, mh, 0.5* $rootScope.devWidth, maxRowHeight); + return calculateAspectRatioFit(mw, mh, maxThumbWidth, maxThumbHeight); } else { // go till 30% of width in small portrait, but restricted to useable row height - return calculateAspectRatioFit(mw, mh, 0.5* $rootScope.devWidth, maxRowHeight); + return calculateAspectRatioFit(mw, mh, maxThumbWidth, maxThumbHeight); } } diff --git a/www/templates/events.html b/www/templates/events.html index 7ce3c3f7..e8f5dfa7 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -69,7 +69,8 @@ <div class="col events-list-text"> <!-- data --> <!-- for largeThumbs show image in this column --> - <div ng-if="loginData.eventViewThumbs!='none' && thumbClass=='large'" width="100%" style="padding: 5px;"> + <div ng-if="loginData.eventViewThumbs!='none' && thumbClass=='large'" width="100%" + style="padding-top: 5px; padding-bottom: 5px; margin-left: -5px; margin-right: -5px;"> <img bg-color="#6C7A89" ng-src="{{constructThumbnail(event)}}" on-tap="closeIfOpen(event);openModalWithSnapshot(event)" width="{{event.Event.thumbWidth}}px" height="{{event.Event.thumbHeight}}px" fallback-src="img/noimage.png" |