wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cover both width and height for the sidebar preview

Browse source
This commit is contained in:
Robin Appelman 2015-09-25 16:00:05 +02:00 committed by Morris Jobke
parent c269f658eb
commit f41a38ba15
3 changed files with 73 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/files/js/mainfileinfodetailview.js
View file

@ -140,7 +140,8 @@
},
loadPreview: function(path, mime, etag, $iconDiv, $container, isImage) {
var maxImageHeight = ($container.parent().width() + 50) / (16/9); // 30px for negative margin
var maxImageWidth = $container.parent().width() + 50; // 50px for negative margins
var maxImageHeight = maxImageWidth / (16/9);
var smallPreviewSize = 75;
var isLandscape = function(img) {
@ -164,8 +165,9 @@
mime: mime,
etag: etag,
y: isImage ? maxImageHeight : smallPreviewSize,
x: isImage ? 99999 /* only limit on y */ : smallPreviewSize,
x: isImage ? maxImageWidth : smallPreviewSize,
a: isImage ? 1 : null,
mode: isImage ? 'cover' : null,
callback: function (previewUrl, img) {
$iconDiv.previewImg = previewUrl;

52
lib/private/preview.php
View file

@ -837,14 +837,6 @@ class Preview {
$askedWidth = $this->getMaxX();
$askedHeight = $this->getMaxY();
/**
* Phase 1: If required, adjust boundaries to keep aspect ratio
*/
if ($this->keepAspect) {
list($askedWidth, $askedHeight) =
$this->applyAspectRatio($askedWidth, $askedHeight, $previewWidth, $previewHeight);
}
if ($this->mode === self::MODE_COVER) {
list($scaleWidth, $scaleHeight) =
$this->applyCover($askedWidth, $askedHeight, $previewWidth, $previewHeight);
@ -853,6 +845,14 @@ class Preview {
$scaleHeight = $askedHeight;
}
/**
* Phase 1: If required, adjust boundaries to keep aspect ratio
*/
if ($this->keepAspect) {
list($scaleWidth, $scaleHeight) =
$this->applyAspectRatio($scaleWidth, $scaleHeight, $previewWidth, $previewHeight);
}
/**
* Phase 2: Resizes preview to try and match requirements.
* Takes the scaling ratio into consideration
@ -870,26 +870,30 @@ class Preview {
/**
* Phase 3: We're still not there yet, so we're clipping and filling
* to match the asked dimensions
* to match the asked dimensions if we're not asked to keep aspect ratio
*/
// It turns out the scaled preview is now too big, so we crop the image
if ($newPreviewWidth >= $askedWidth && $newPreviewHeight >= $askedHeight) {
$this->crop($image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight);
$this->storePreview($fileId, $askedWidth, $askedHeight);
return;
if (!$this->keepAspect) {
// It turns out the scaled preview is now too big, so we crop the image
if ($newPreviewWidth >= $askedWidth && $newPreviewHeight >= $askedHeight) {
$this->crop($image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight);
$this->storePreview($fileId, $askedWidth, $askedHeight);
return;
}
// At least one dimension of the scaled preview is too small,
// so we fill the space with a transparent background
if (($newPreviewWidth < $askedWidth || $newPreviewHeight < $askedHeight)) {
$this->cropAndFill(
$image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight
);
$this->storePreview($fileId, $askedWidth, $askedHeight);
return;
}
}
// At least one dimension of the scaled preview is too small,
// so we fill the space with a transparent background
if (($newPreviewWidth < $askedWidth || $newPreviewHeight < $askedHeight)) {
$this->cropAndFill(
$image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight
);
$this->storePreview($fileId, $askedWidth, $askedHeight);
return;
}
// The preview is smaller, but we can't touch it
$this->storePreview($fileId, $newPreviewWidth, $newPreviewHeight);
}

41
tests/lib/preview.php
View file

@ -874,4 +874,45 @@ class Preview extends TestCase {
return [(int)$askedWidth, (int)$askedHeight];
}
public function testKeepAspectRatio() {
$originalWidth = 1680;
$originalHeight = 1050;
$originalAspectRation = $originalWidth / $originalHeight;
$preview = new \OC\Preview(
self::TEST_PREVIEW_USER1, 'files/', 'testimage.jpg',
150,
150
);
$preview->setKeepAspect(true);
$image = $preview->getPreview();
$aspectRatio = $image->width() / $image->height();
$this->assertEquals(round($originalAspectRation, 2), round($aspectRatio, 2));
$this->assertLessThanOrEqual(150, $image->width());
$this->assertLessThanOrEqual(150, $image->height());
}
public function testKeepAspectRatioCover() {
$originalWidth = 1680;
$originalHeight = 1050;
$originalAspectRation = $originalWidth / $originalHeight;
$preview = new \OC\Preview(
self::TEST_PREVIEW_USER1, 'files/', 'testimage.jpg',
150,
150
);
$preview->setKeepAspect(true);
$preview->setMode(\OC\Preview::MODE_COVER);
$image = $preview->getPreview();
$aspectRatio = $image->width() / $image->height();
$this->assertEquals(round($originalAspectRation, 2), round($aspectRatio, 2));
$this->assertGreaterThanOrEqual(150, $image->width());
$this->assertGreaterThanOrEqual(150, $image->height());
}
}