Changeset 12679 for extensions/GThumb

Timestamp:

Dec 1, 2011, 3:25:47 PM (13 years ago)

Author:

patdenice

Message:

Display is better whith 1 or 2 lines

File:

• extensions/GThumb/js/gthumb.js (modified) (3 diffs)

extensions/GThumb/js/gthumb.js

@@ -78 +78 @@
         width_count = this.margin;
         height = this.margin;
+        max_height = 0;
         available_width = main_width - (width + this.margin);
         line = 1;
@@ -83 +84 @@
 
           width_count += this.t[i].width + this.margin;
+          max_height = Math.max(this.t[i].height, max_height);
 
           if (width_count > available_width) {
             ratio = width_count / available_width;
-            height += Math.round(this.t[i].height / ratio);
+            height += Math.round(max_height / ratio);
             line++;
+            max_height = 0;
             width_count = this.margin;
             if (line > 2) {
-              if (height > best_size.height && width/height > min_ratio && height<=this.big_thumb.height) {
+              if (height >= best_size.height && width/height >= min_ratio && height<=this.big_thumb.height) {
                 best_size = {width:width,height:height}
               }
@@ -98 +101 @@
         }
         if (line <= 2) {
-          best_size = {width:width,height:this.big_thumb.height};
+          if (max_height == 0 || line == 1) {
+            height = this.big_thumb.height;
+          } else {
+            height += max_height;
+          }
+          if (height >= best_size.height && width/height >= min_ratio && height<=this.big_thumb.height) {
+            best_size = {width:width,height:height}
+          }
         }
       }