summaryrefslogtreecommitdiff
path: root/src/menu.c
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2011-01-26 19:28:10 +0100
committerDaniel Friesel <derf@finalrewind.org>2011-01-26 19:28:10 +0100
commit05f20c748e731f0ca79e6c3646c399940fe06578 (patch)
tree49d853b9aec891816c42fb24484822ab134a86b0 /src/menu.c
parent0d4a5ee84a933e6652912dfd4228fc6f30c7ad5f (diff)
Revert "Add --zoom fill as equivalent to --auto-zoom"
This reverts commit da92889e88a89e48cbcce134b6afa7c504e7569e.
Diffstat (limited to 'src/menu.c')
-rw-r--r--src/menu.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/menu.c b/src/menu.c
index 1e81cd6..2ef2dc7 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1436,10 +1436,7 @@ 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);
- if (MENU_ITEM_IS_ON(i))
- opt.zoom_mode = ZOOM_MODE_FILL;
- else
- opt.zoom_mode = 0;
+ opt.auto_zoom = MENU_ITEM_IS_ON(i) ? 1 : 0;
winwidget_rerender_all(1, 1);
break;
}
@@ -1491,7 +1488,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.zoom_mode == ZOOM_MODE_FILL));
+ 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, "Freeze Window Size", NULL, NULL,
CB_OPT_FREEZE_WINDOW, NULL, NULL, opt.geom_flags);
feh_menu_add_toggle_entry(mm, "Fullscreen", NULL, NULL,