discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=63f9ddcbb0407af5c56b5974cc917cb6cc392bdb
commit 63f9ddcbb0407af5c56b5974cc917cb6cc392bdb Author: Mike Blumenkrantz <[email protected]> Date: Sun Dec 1 10:19:59 2013 -0500 improve upgrade path for removal of raise on focus option --- src/bin/e_config.c | 12 ++++++++++++ src/bin/e_config.h | 1 + 2 files changed, 13 insertions(+) diff --git a/src/bin/e_config.c b/src/bin/e_config.c index 3ccd865..1d13775 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -616,6 +616,7 @@ _e_config_edd_init(Eina_Bool old) E_CONFIG_VAL(D, T, mouse_accel_threshold, INT); E_CONFIG_VAL(D, T, border_raise_on_mouse_action, INT); + E_CONFIG_VAL(D, T, border_raise_on_focus, INT); E_CONFIG_VAL(D, T, desk_flip_wrap, INT); E_CONFIG_VAL(D, T, fullscreen_flip, INT); E_CONFIG_VAL(D, T, multiscreen_flip, INT); @@ -1205,6 +1206,16 @@ e_config_load(void) CONFIG_VERSION_UPDATE_INFO(11); e_config->pointer_warp_speed = e_config->winlist_warp_speed; e_config->winlist_warp_speed = 0; + + if (e_config->focus_policy == E_FOCUS_CLICK) + { + if (e_config->border_raise_on_focus) + { + /* approximate expected behavior from removed option */ + e_config->always_click_to_focus = 1; + e_config->always_click_to_raise = 1; + } + } } CONFIG_VERSION_CHECK(12) { @@ -1366,6 +1377,7 @@ e_config_load(void) E_CONFIG_LIMIT(e_config->desklock_ask_presentation, 0, 1); E_CONFIG_LIMIT(e_config->desklock_ask_presentation_timeout, 1.0, 300.0); E_CONFIG_LIMIT(e_config->border_raise_on_mouse_action, 0, 1); + E_CONFIG_LIMIT(e_config->border_raise_on_focus, 0, 1); E_CONFIG_LIMIT(e_config->desk_flip_wrap, 0, 1); E_CONFIG_LIMIT(e_config->fullscreen_flip, 0, 1); E_CONFIG_LIMIT(e_config->icon_theme_overrides, 0, 1); diff --git a/src/bin/e_config.h b/src/bin/e_config.h index 9fb334d..a7e3f59 100644 --- a/src/bin/e_config.h +++ b/src/bin/e_config.h @@ -257,6 +257,7 @@ struct _E_Config int mouse_accel_threshold; // GUI int border_raise_on_mouse_action; // GUI + int border_raise_on_focus; // GUI int desk_flip_wrap; // GUI int fullscreen_flip; // GUI int multiscreen_flip; // GUI --
