- Updates logic behind image dimensions based on column width

This commit is contained in:
Vlad
2016-02-12 12:05:27 -05:00
parent 57f0b88299
commit 27d5972306
2 changed files with 240 additions and 248 deletions

View File

@@ -23,18 +23,18 @@ class Image {
$column_width = ColumnsHelper::columnWidth($column_count);
$padded_width = StylesHelper::$padding_width * 2;
// scale image to fit column width
if($element['width'] > $column_width ||
($element['width'] < $column_width && $element['fullWidth'] === true)
) {
if($element['width'] > $column_width) {
$ratio = $element['width'] / $column_width;
$element['width'] = $column_width;
$element['height'] = ceil($element['height'] / $ratio);
$element['height'] = (int) ceil($element['height'] / $ratio);
}
// resize image if the image is padded and wider than column width
if($element['fullWidth'] === false && $element['width'] >= $column_width) {
$ratio = $element['width'] / ($element['width'] - $padded_width);
$element['width'] = $element['width'] - $padded_width;
$element['height'] = ceil($element['height'] / $ratio);
// resize image if the image is padded and wider than padded column width
if($element['fullWidth'] === false &&
$element['width'] > ($column_width - $padded_width)
) {
$ratio = $element['width'] / ($column_width - $padded_width);
$element['width'] = $column_width - $padded_width;
$element['height'] = (int) ceil($element['height'] / $ratio);
}
return $element;
}