From 43a04c4757f4a20c3b9b1487ea7894c0f3e73708 Mon Sep 17 00:00:00 2001 From: Bert Münnich Date: Tue, 4 Feb 2014 23:03:53 +0100 Subject: Revised scale mode and zoom level handling - Scale mode is not reset to default value upon image loading anymore - New default key binding to change mode to scale-down - Removed scale mode setting from config.h - Removed -d command line option, as this is now the default at startup --- config.def.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'config.def.h') diff --git a/config.def.h b/config.def.h index 8b835db..4236302 100644 --- a/config.def.h +++ b/config.def.h @@ -23,14 +23,6 @@ static const char * const BAR_FG_COLOR = "#EEEEEE"; #endif #ifdef _IMAGE_CONFIG -/* how should images be scaled when they are loaded? - * (also controllable via -d/-s/-Z/-z options) - * SCALE_DOWN: 100%, but fit large images into window, - * SCALE_FIT: fit all images into window, - * SCALE_ZOOM: use current zoom level, 100% at startup - */ -static const scalemode_t SCALE_MODE = SCALE_DOWN; - /* levels (in percent) to use when zooming via '-' and '+': * (first/last value is used as min/max zoom level) */ @@ -138,7 +130,8 @@ static const keymap_t keys[] = { { 0, XK_minus, i_zoom, (arg_t) -1 }, { 0, XK_KP_Subtract, i_zoom, (arg_t) -1 }, { 0, XK_equal, i_set_zoom, (arg_t) 100 }, - { 0, XK_w, i_fit_to_win, (arg_t) SCALE_FIT }, + { 0, XK_w, i_fit_to_win, (arg_t) SCALE_DOWN }, + { 0, XK_W, i_fit_to_win, (arg_t) SCALE_FIT }, { 0, XK_e, i_fit_to_win, (arg_t) SCALE_WIDTH }, { 0, XK_E, i_fit_to_win, (arg_t) SCALE_HEIGHT }, -- cgit v1.2.3-54-g00ecf