From 8821ce80b1139b0104439a9e87d8d8e6e3b0b595 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Thu, 22 Apr 2010 12:45:50 +0200 Subject: Partially fix zoom mode Does not yet work with initial zoom value != 100% --- src/winwidget.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/winwidget.c') diff --git a/src/winwidget.c b/src/winwidget.c index 5ee7ace..4a649bd 100644 --- a/src/winwidget.c +++ b/src/winwidget.c @@ -69,11 +69,10 @@ static winwidget winwidget_allocate(void) ret->im_x = 0; ret->im_y = 0; ret->zoom = 1.0; + ret->old_zoom = 1.0; ret->click_offset_x = 0; ret->click_offset_y = 0; - ret->im_click_offset_x = 0; - ret->im_click_offset_y = 0; ret->has_rotated = 0; D_RETURN(4, ret); @@ -911,14 +910,13 @@ void feh_debug_print_winwid(winwidget w) "h = %d\n" "im_w = %d\n" "im_h = %d\n" "im_angle = %f\n" "type = %d\n" "had_resize = %d\n" "im = %p\n" "GC = %p\n" "pixmap = %ld\n" "name = %s\n" "file = %p\n" "mode = %d\n" - "im_x = %d\n" "im_y = %d\n" "zoom = %f\n" + "im_x = %d\n" "im_y = %d\n" "zoom = %f\n" "old_zoom = %f\n" "click_offset_x = %d\n" "click_offset_y = %d\n" - "im_click_offset_x = %d\n" "im_click_offset_y = %d\n" "has_rotated = %d\n", (void *)w, w->win, w->w, w->h, w->im_w, w->im_h, w->im_angle, w->type, w->had_resize, w->im, (void *)w->gc, w->bg_pmap, w->name, (void *)w->file, w->mode, w->im_x, w->im_y, - w->zoom, w->click_offset_x, w->click_offset_y, - w->im_click_offset_x, w->im_click_offset_y, w->has_rotated); + w->zoom, w->old_zoom, w->click_offset_x, w->click_offset_y, + w->has_rotated); } void winwidget_reset_image(winwidget winwid) -- cgit v1.2.3