Changeset 32032

Timestamp:

Nov 25, 2019, 1:52:19 AM (4 years ago)

Author:

SergeD

Message:

version 1.0.22 - see changelog for details

Location:

extensions/GDThumb

Files:

• changelog.txt (modified) (1 diff)
• js/gdthumb.js (modified) (1 diff)
• main.inc.php (modified) (2 diffs)

extensions/GDThumb/changelog.txt

@@ -26 +26 @@
 
 === Changelog ===
+version 1.0.22
+- Fix for tile crop - see https://piwigo.org/forum/viewtopic.php?pid=168141#p168141
+
 version 1.0.21
 + Support for PIWIGO 2.9 and 2.10 verified

extensions/GDThumb/js/gdthumb.js

@@ -255 +255 @@
     }
 
-    // Last line does not need to be cropped
+    // Crop last line only if we have more than one line
     for (j = 0; j < thumb_process.length; j++) {
-                        GDThumb.resize(jQuery('ul.thumbnails img.thumbnail').eq(thumb_process[j].index), thumb_process[j].real_width, thumb_process[j].real_height, thumb_process[j].width, last_height, false);
-                }
+
+      // we have only one line, i.e. the first line is the one and only line and therefor the last line too
+      if (line == 1) {
+        GDThumb.resize(jQuery('ul.thumbnails img.thumbnail').eq(thumb_process[j].index), thumb_process[j].real_width, thumb_process[j].real_height, thumb_process[j].width, last_height, false);
+      }
+      // we have more than one line
+      else {
+        if ((GDThumb.method == 'square') || (GDThumb.method == 'slide')) {
+          new_width = GDThumb.max_height;
+          new_height = GDThumb.max_height;
+        }
+        else {
+          new_width = (thumb_process[j].width + round_rest) / ratio;
+          round_rest = new_width - Math.round(new_width);
+          new_width = Math.round(new_width);
+        }
+
+        GDThumb.resize(jQuery('ul.thumbnails img.thumbnail').eq(thumb_process[j].index), thumb_process[j].real_width, thumb_process[j].real_height, new_width, new_height, false);
+        last_height = Math.min(last_height, new_height);
+
+        width_count += new_width + GDThumb.margin;
+      }
+    }
 
     if (main_width != jQuery('ul.thumbnails').width()) {

extensions/GDThumb/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: gdThumb
-Version: 1.0.21
+Version: 1.0.22
 Description: Apply Masonry style to album or image thumbs
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=771
@@ -19 +19 @@
 // | Plugin constants                                               |
 // +-----------------------------------------------------------------------+
-define('GDTHUMB_VERSION', '1.0.21');
+define('GDTHUMB_VERSION', '1.0.22');
 define('GDTHUMB_ID',      basename(dirname(__FILE__)));
 define('GDTHUMB_PATH' ,   PHPWG_PLUGINS_PATH . GDTHUMB_ID . '/');