From b11d6c94fe54412a328544cdc5e9eea7b00f1136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 27 Mar 2019 10:36:21 +0100
Subject: [PATCH] Always show full previews
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/files/css/detailsView.scss        |  7 ++++---
 apps/files/js/sidebarpreviewmanager.js | 29 ++++++++++----------------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/apps/files/css/detailsView.scss b/apps/files/css/detailsView.scss
index 71062648c9..e13cf0d7a4 100644
--- a/apps/files/css/detailsView.scss
+++ b/apps/files/css/detailsView.scss
@@ -72,12 +72,13 @@
 }
 
 #app-sidebar .thumbnail {
-	width: 75px;
-	height: 75px;
+	width: 100%;
+	min-height: 75px;
 	display: inline-block;
 	float: left;
 	margin-right: 10px;
-	background-size: 75px;
+	background-size: contain;
+	background-repeat: no-repeat;
 }
 
 #app-sidebar .ellipsis {
diff --git a/apps/files/js/sidebarpreviewmanager.js b/apps/files/js/sidebarpreviewmanager.js
index 69528ce4e4..cb5a7ee996 100644
--- a/apps/files/js/sidebarpreviewmanager.js
+++ b/apps/files/js/sidebarpreviewmanager.js
@@ -60,7 +60,6 @@
 			var isImage = model.isImage();
 			var maxImageWidth = $thumbnailContainer.parent().width() + 50;  // 50px for negative margins
 			var maxImageHeight = maxImageWidth / (16 / 9);
-			var smallPreviewSize = 75;
 
 			var isLandscape = function (img) {
 				return img.width > (img.height * 1.2);
@@ -71,15 +70,11 @@
 			};
 
 			var getTargetHeight = function (img) {
-				if (isImage) {
-					var targetHeight = img.height / window.devicePixelRatio;
-					if (targetHeight <= smallPreviewSize) {
-						targetHeight = smallPreviewSize;
-					}
-					return targetHeight;
-				} else {
-					return smallPreviewSize;
+				var targetHeight = img.height / window.devicePixelRatio;
+				if (targetHeight <= maxImageHeight) {
+					targetHeight = maxImageHeight;
 				}
+				return targetHeight;
 			};
 
 			var getTargetRatio = function (img) {
@@ -96,10 +91,10 @@
 				path: model.getFullPath(),
 				mime: model.get('mimetype'),
 				etag: model.get('etag'),
-				y: isImage ? maxImageHeight : smallPreviewSize,
-				x: isImage ? maxImageWidth : smallPreviewSize,
-				a: isImage ? 1 : null,
-				mode: isImage ? 'cover' : null,
+				y: maxImageHeight,
+				x: maxImageWidth,
+				a: 1,
+				mode: 'cover',
 				callback: function (previewUrl, img) {
 					$thumbnailDiv.previewImg = previewUrl;
 
@@ -109,16 +104,14 @@
 					}
 					$thumbnailDiv.removeClass('icon-loading icon-32');
 					var targetHeight = getTargetHeight(img);
-					if (isImage && targetHeight > smallPreviewSize) {
-						$thumbnailContainer.addClass((isLandscape(img) && !isSmall(img)) ? 'landscape' : 'portrait');
-						$thumbnailContainer.addClass('large');
-					}
+					$thumbnailContainer.addClass((isLandscape(img) && !isSmall(img)) ? 'landscape' : 'portrait');
+					$thumbnailContainer.addClass('large');
 
 					// only set background when we have an actual preview
 					// when we don't have a preview we show the mime icon in the error handler
 					$thumbnailDiv.css({
 						'background-image': 'url("' + previewUrl + '")',
-						height: (targetHeight > smallPreviewSize) ? 'auto' : targetHeight,
+						height: (targetHeight > maxImageHeight) ? 'auto' : targetHeight,
 						'max-height': isSmall(img) ? targetHeight : null
 					});