Commit 17e2a29a authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Center images in index/thumbnail mode 

Centering didn't work if the text below the thumbnail was wider than the
thumbnail itself. Fixed.
parent eca0d6e5

ChangeLog

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ git HEAD 


    * Patch by aaptel: Support numpad keys for actions

    * Fix blur mode (Ctrl + left mouse key)

    * Center images in index/thumbnail mode relative to the text below them



Thu May  6 08:34:39 CEST 2010  Daniel Friesel <derf@chaosdorf.de>

src/index.c

+6 −8
Original line number Diff line number Diff line
@@ -398,14 +398,12 @@ void init_index_mode(void) 
					break;

			}



			if (opt.aspect) {

				xxx = x + ((opt.thumb_w - www) / 2);

				yyy = y + ((opt.thumb_h - hhh) / 2);

			} else {

				/* Ignore the aspect ratio and squash the image in */

				xxx = x;

			/* center image relative to the text below it (if any) */

			xxx = x + ((text_area_w - www) / 2);

			yyy = y;

			}



			if (opt.aspect)

				yyy += (opt.thumb_h - hhh) / 2;



			/* Draw now */

			gib_imlib_blend_image_onto_image(im_main, im_thumb,

src/thumbnail.c

+6 −8
Original line number Diff line number Diff line
@@ -278,14 +278,12 @@ void init_thumbnail_mode(void) 
					break;

			}



			if (opt.aspect) {

				xxx = x + ((opt.thumb_w - www) / 2);

				yyy = y + ((opt.thumb_h - hhh) / 2);

			} else {

				/* Ignore the aspect ratio and squash the image in */

				xxx = x;

			/* center image relative to the text below it (if any) */

			xxx = x + ((td.text_area_w - www) / 2);

			yyy = y;

			}



			if (opt.aspect)

				yyy += (opt.thumb_h - hhh) / 2;



			/* Draw now */

			gib_imlib_blend_image_onto_image(td.im_main,