summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2011-05-09 20:17:09 +0200
committerDaniel Friesel <derf@finalrewind.org>2011-05-09 20:17:09 +0200
commit30b0f6ae5a03d46052320612b24086ff94a75d76 (patch)
tree1c01a8fb5522712f44dadb6e3391e6590d4a60e9 /src
parent9e8f566560eb1f6d1e78f1891424883414f28652 (diff)
Fix --zoom max/fill documentation plus bug in menu code (thx nepraith)
Diffstat (limited to 'src')
-rw-r--r--src/menu.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/menu.c b/src/menu.c
index 795a59e..fe58760 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -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,