keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12398 from MarekBenjamin/image-grid-fixes

Browse source 
Fixed image grid when exactly ONE portrait and ONE landscape is attached
This commit is contained in:
Hypolite Petovan 2022-12-12 19:15:00 -05:00 committed by GitHub
commit ed805d1af2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Model/Item.php
View file

@ -3175,13 +3175,22 @@ class Item
// Mix of landscape and portrait images.
if ($lcount == $pcount) {
// equal amount of landscapes and portraits
for ($l = 0; $l < $lcount; $l++) {
if ($l % 2 == 0) {
$images_fc[] = $landscapeimages[$l];
$images_fc[] = $portraitimages[$l];
} else {
$images_sc[] = $portraitimages[$l];
$images_sc[] = $landscapeimages[$l];
if ($lcount == 1) {
// one left / one right
$images_fc[] = $landscapeimages[0];
$images_sc[] = $portraitimages[0];
} else {
// Distribute equal to both columns
for ($l = 0; $l < $lcount; $l++) {
if ($l % 2 == 0) {
// landscape left and portrait right for even numbers
$images_fc[] = $landscapeimages[$l];
$images_fc[] = $portraitimages[$l];
} else {
// portraits left and landscape right for odd numbers
$images_sc[] = $portraitimages[$l];
$images_sc[] = $landscapeimages[$l];
}
}
}
}