summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2012-10-23 17:42:12 +0200
committerDaniel Friesel <derf@finalrewind.org>2012-10-23 17:42:26 +0200
commit7c00adf853acc76520d43a12eb63ec151924d5ab (patch)
tree057581cf42cd6bce03f917198425d8a902797e5a
parent16654adff8ebd584bc93c4798b4e997dd286976e (diff)
Do not apply --scale-down to a thumbnail window (#106)
-rw-r--r--man/feh.pre6
-rw-r--r--src/winwidget.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/man/feh.pre b/man/feh.pre
index 8ef5318..c60e15a 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -558,8 +558,10 @@ theme.
Same as Index mode, but the thumbnails are clickable image launchers.
Note that
.Cm --fullscreen
-does not affect the thumbnail window. It does, however, work for the image
-windows launched from thumbnail mode.
+and
+.Cm --scale-down
+do not affect the thumbnail window. They do, however, work for image windows
+launched from thumbnail mode.
Also supports
.Sx MONTAGE MODE OPTIONS .
.
diff --git a/src/winwidget.c b/src/winwidget.c
index 0a9adc8..2f543df 100644
--- a/src/winwidget.c
+++ b/src/winwidget.c
@@ -402,6 +402,7 @@ void winwidget_render_image(winwidget winwid, int resize, int force_alias)
if (!winwid->full_screen && opt.scale_down && ((winwid->w < winwid->im_w)
|| (winwid->h < winwid->im_h)) &&
+ (winwid->type != WIN_TYPE_THUMBNAIL) &&
(winwid->old_zoom == 1.0)) {
D(("scaling down image %dx%d\n", winwid->w, winwid->h));
@@ -512,7 +513,8 @@ void winwidget_render_image(winwidget winwid, int resize, int force_alias)
winwid->im_y = (int) (max_h - (winwid->im_h * winwid->zoom)) >> 1;
}
}
- else if (need_center && !winwid->full_screen && opt.scale_down) {
+ else if (need_center && !winwid->full_screen && opt.scale_down
+ && (winwid->type != WIN_TYPE_THUMBNAIL)) {
winwid->im_x = (int) (winwid->w - (winwid->im_w * winwid->zoom)) >> 1;
winwid->im_y = (int) (winwid->h - (winwid->im_h * winwid->zoom)) >> 1;
}