X-Git-Url: https://git.distorted.org.uk/~mdw/tgal/blobdiff_plain/2fe5383f36780a06574ea3a46e7d4d62ee4111a0..ccaab4e8a37a81ce43437a3ed7fbc0fd0cae7e1f:/mason/dhandler

diff --git a/mason/dhandler b/mason/dhandler
index 42b324c..a48610c 100755
--- a/mason/dhandler
+++ b/mason/dhandler
@@ -86,14 +86,14 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 	my $size = "medthumb";
 	my %tn;
 	for my $f (@$ff)
-	  { $tn{$f} = TrivGal::Image->new($path . $f->name); }
+	  { $tn{$f} = TrivGal::Image->new($path . $f->name)->scale($size); }
 	for my $d (@$dd) {
 	  my $p = join_paths $path, $d->name;
 	  DIR: for (;;) {
 	    my ($ddd, $fff, $iii) = listdir join_paths $IMGROOT, $p;
 	    if (defined $iii) {
 	      my $index = join_paths $p, $iii->name;
-	      $tn{$d} = TrivGal::Image->new($index);
+	      $tn{$d} = TrivGal::Image->new($index)->scale($size);
 	      last DIR;
 	    }
 	    if (!@$ddd) { $tn{$d} = undef; last DIR; }
@@ -119,7 +119,7 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 <div class="gallery <% $size %>">
 %   for my $d (@$dd) {
   <& .thumbnail, target => $d->name, comment => $d->comment,
-		 img => $tn{$d}, size => $size,
+		 tn => $tn{$d}, size => $size,
 		 caption => $m->interp->apply_escapes($d->name, "h") &>\
 %   }
 </div>
@@ -130,7 +130,7 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 <div class="gallery <% $size %>">
 %   for my $f (@$ff) {
   <& .thumbnail, target => $f->name, comment => $f->comment,
-		 img => $tn{$f}, size => $size,
+		 tn => $tn{$f}, size => $size,
 		 caption => $m->interp->apply_escapes($f->name, "h") &>\
 %   }
 </div>
@@ -212,7 +212,8 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 % for my $size (qw{smallthumb medthumb bigthumb}) {
 <div class="thumbstrip <% $size %>">
 %   for my $f (@$ff) {
-  <& .thumbnail, target => $f->name, img => $img{$f}, size => $size,
+  <& .thumbnail, target => $f->name,
+		 img => $img{$f}->scale($size), size => $size,
 		 caption => $m->interp->apply_escapes($f->name, "h"),
 		 focus => $f eq $this &>\
 %   }
@@ -257,9 +258,7 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 %
 %###-------------------------------------------------------------------------
 <%def .thumbnail>\
-% my $tn;
-% if (defined $img) { $tn = $img->scale($size); }
-% else { $tn = "$STATICURL/folder.svg"; }
+% $tn //= "$STATICURL/folder.svg";
 % if ($focus) {
   <figure class="thumb focusthumb <% $size %>">
     <img class="thumb <% $size %>" load=lazy src="<% $tn |h %>">
@@ -280,7 +279,7 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 %
 <%args>
 	$target
-	$img
+	$tn
 	$size
 	$caption
 	$comment => undef