From 17e2a29a5509939e6d2732d8b3d369b286f758b8 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sun, 30 May 2010 22:43:12 +0200 Subject: Center images in index/thumbnail mode Centering didn't work if the text below the thumbnail was wider than the thumbnail itself. Fixed. --- ChangeLog | 1 + src/index.c | 14 ++++++-------- src/thumbnail.c | 14 ++++++-------- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3bbdd8b..8e0ad43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/src/index.c b/src/index.c index c7c0a84..80f420c 100644 --- a/src/index.c +++ b/src/index.c @@ -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; - yyy = y; - } + /* 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, diff --git a/src/thumbnail.c b/src/thumbnail.c index c472fc0..f4304af 100644 --- a/src/thumbnail.c +++ b/src/thumbnail.c @@ -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; - yyy = y; - } + /* 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, -- cgit v1.2.3