diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | man/feh.pre | 2 | ||||
| -rw-r--r-- | src/menu.c | 5 |
3 files changed, 6 insertions, 3 deletions
@@ -23,6 +23,8 @@ git HEAD <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=570903> * Minor manpage fixes. <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=625683> + * Fix --auto-zoom / --zoom max/fill documentation, the "Auto-Zoom" menu + option is now always checked when these options are used Sat, 23 Apr 2011 22:00:27 +0200 Daniel Friesel <derf@finalrewind.org> diff --git a/man/feh.pre b/man/feh.pre index 2d94416..af938b7 100644 --- a/man/feh.pre +++ b/man/feh.pre @@ -483,7 +483,7 @@ when in full screen mode or when window geometry is fixed. When combined with zooming will be limited to the specified .Ar percent . Specifying -.Cm fill +.Cm max is like setting .Cm --auto-zoom , using @@ -1398,7 +1398,7 @@ void feh_menu_cb(feh_menu * m, feh_menu_item * i, int action, void *data) case CB_OPT_AUTO_ZOOM: MENU_ITEM_TOGGLE(i); if (MENU_ITEM_IS_ON(i)) - opt.zoom_mode = ZOOM_MODE_FILL; + opt.zoom_mode = ZOOM_MODE_MAX; else opt.zoom_mode = 0; winwidget_rerender_all(1); @@ -1452,7 +1452,8 @@ static feh_menu *feh_menu_func_gen_options(feh_menu * m) mm = feh_menu_new(); mm->name = estrdup("OPTIONS"); mm->fehwin = m->fehwin; - feh_menu_add_toggle_entry(mm, "Auto-Zoom", NULL, NULL, CB_OPT_AUTO_ZOOM, NULL, NULL, (opt.zoom_mode == ZOOM_MODE_FILL)); + feh_menu_add_toggle_entry(mm, "Auto-Zoom", NULL, NULL, CB_OPT_AUTO_ZOOM, + NULL, NULL, opt.zoom_mode); feh_menu_add_toggle_entry(mm, "Freeze Window Size", NULL, NULL, CB_OPT_FREEZE_WINDOW, NULL, NULL, opt.geom_flags); feh_menu_add_toggle_entry(mm, "Fullscreen", NULL, NULL, |