~ubuntu-branches/debian/sid/feh/sid

« back to all changes in this revision

Viewing changes to src/index.c

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Tille
  • Date: 2010-06-01 11:37:21 UTC
  • mfrom: (1.3.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100601113721-fraf4g038q7jdpcw
Tags: 1.6-1
* New upstream version
  Closes: #430218
* debian/control: Build-Depends: perl-modules, libtest-command-perl
  to enable testing

Show diffs side-by-side

added added

removed removed

Lines of Context:
398
398
                                        break;
399
399
                        }
400
400
 
401
 
                        if (opt.aspect) {
402
 
                                xxx = x + ((opt.thumb_w - www) / 2);
403
 
                                yyy = y + ((opt.thumb_h - hhh) / 2);
404
 
                        } else {
405
 
                                /* Ignore the aspect ratio and squash the image in */
406
 
                                xxx = x;
407
 
                                yyy = y;
408
 
                        }
 
401
                        /* center image relative to the text below it (if any) */
 
402
                        xxx = x + ((text_area_w - www) / 2);
 
403
                        yyy = y;
 
404
 
 
405
                        if (opt.aspect)
 
406
                                yyy += (opt.thumb_h - hhh) / 2;
409
407
 
410
408
                        /* Draw now */
411
409
                        gib_imlib_blend_image_onto_image(im_main, im_thumb,