summaryrefslogtreecommitdiff
path: root/src/menu.c
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2011-01-22 20:08:10 +0100
committerDaniel Friesel <derf@finalrewind.org>2011-01-22 20:08:10 +0100
commitda92889e88a89e48cbcce134b6afa7c504e7569e (patch)
tree9a3592740656f0491742e9b296f8cb539bf3ad8c /src/menu.c
parent92123b141236c680e00c3460b93de46edacfda0a (diff)
Add --zoom fill as equivalent to --auto-zoom
Diffstat (limited to 'src/menu.c')
-rw-r--r--src/menu.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/menu.c b/src/menu.c
index 2ef2dc7..1e81cd6 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1436,7 +1436,10 @@ void feh_menu_cb(feh_menu * m, feh_menu_item * i, int action, void *data)
break;
case CB_OPT_AUTO_ZOOM:
MENU_ITEM_TOGGLE(i);
- opt.auto_zoom = MENU_ITEM_IS_ON(i) ? 1 : 0;
+ if (MENU_ITEM_IS_ON(i))
+ opt.zoom_mode = ZOOM_MODE_FILL;
+ else
+ opt.zoom_mode = 0;
winwidget_rerender_all(1, 1);
break;
}
@@ -1488,7 +1491,7 @@ 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.auto_zoom);
+ 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, "Freeze Window Size", NULL, NULL,
CB_OPT_FREEZE_WINDOW, NULL, NULL, opt.geom_flags);
feh_menu_add_toggle_entry(mm, "Fullscreen", NULL, NULL,