diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2011-08-11 20:30:06 +0200 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2011-08-11 20:34:58 +0200 |
| commit | 64e9c952f0bbd5c23fd775620f3df1c261799ed6 (patch) | |
| tree | 9bbd40e8ed8af7f17664269f59ce10c27a1215bd /src/events.c | |
| parent | 03e54647e9ffd21a47cd608f662b5e2cb9a0f7c5 (diff) | |
Show correct file number after deleting image
In the image_remove function, slideshow_change_image needs to be called before
removing the image from the filelist. Because of this, the "x of y" displayed
by --draw-filename is wrong (y is 1 too high).
This commit introduces a new 'render' argument to slideshow_chingae_image.
The image_remove function calls it with render=0, edits the filelist and then
runs by winwidget_render_image itself.
Patch by Yu-Jie Lin.
Diffstat (limited to 'src/events.c')
| -rw-r--r-- | src/events.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/events.c b/src/events.c index 30b6b1a..f76de9f 100644 --- a/src/events.c +++ b/src/events.c @@ -130,12 +130,12 @@ static void feh_event_handle_ButtonPress(XEvent * ev) D(("Prev Button Press event\n")); if ((winwid != NULL) && (winwid->type == WIN_TYPE_SLIDESHOW)) - slideshow_change_image(winwid, SLIDE_PREV); + slideshow_change_image(winwid, SLIDE_PREV, 1); } else if (ev->xbutton.button == opt.next_button) { D(("Next Button Press event\n")); if ((winwid != NULL) && (winwid->type == WIN_TYPE_SLIDESHOW)) - slideshow_change_image(winwid, SLIDE_NEXT); + slideshow_change_image(winwid, SLIDE_NEXT, 1); } else { D(("Received other ButtonPress event\n")); } @@ -191,7 +191,7 @@ static void feh_event_handle_ButtonRelease(XEvent * ev) winwid->mode = MODE_NORMAL; if ((winwid != NULL) && (winwid->type == WIN_TYPE_SLIDESHOW)) { - slideshow_change_image(winwid, SLIDE_NEXT); + slideshow_change_image(winwid, SLIDE_NEXT, 1); } else if ((winwid != NULL) && (winwid->type == WIN_TYPE_THUMBNAIL)) { feh_file *thumbfile; |