From 5766883b04dc1bca2ab15e2b22e5c8d72320dae7 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 10 Jan 2013 14:01:31 +0000 Subject: [PATCH] on second thought, disabling comp effects requires a reshadow so make sure we do that if those settings change SVN revision: 82569 --- src/modules/conf_comp/e_mod_config.c | 29 ++++++++++++++++------------ src/modules/conf_comp/e_mod_main.c | 4 ++++ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/modules/conf_comp/e_mod_config.c b/src/modules/conf_comp/e_mod_config.c index c3a26224c..18e519579 100644 --- a/src/modules/conf_comp/e_mod_config.c +++ b/src/modules/conf_comp/e_mod_config.c @@ -1399,10 +1399,6 @@ static int _advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { - _comp_mod->conf->match.disable_popups = cfdata->match.disable_popups; - _comp_mod->conf->match.disable_borders = cfdata->match.disable_borders; - _comp_mod->conf->match.disable_overrides = cfdata->match.disable_overrides; - _comp_mod->conf->match.disable_menus = cfdata->match.disable_menus; if ((cfdata->lock_fps != _comp_mod->conf->lock_fps) || (cfdata->smooth_windows != _comp_mod->conf->smooth_windows) || (cfdata->grab != _comp_mod->conf->grab) || @@ -1418,6 +1414,10 @@ _advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, (cfdata->fps_corner != _comp_mod->conf->fps_corner) || (cfdata->fps_average_range != _comp_mod->conf->fps_average_range) || (cfdata->first_draw_delay != _comp_mod->conf->first_draw_delay) || + (_comp_mod->conf->match.disable_popups != cfdata->match.disable_popups) || + (_comp_mod->conf->match.disable_borders != cfdata->match.disable_borders) || + (_comp_mod->conf->match.disable_overrides != cfdata->match.disable_overrides) || + (_comp_mod->conf->match.disable_menus != cfdata->match.disable_menus) || (cfdata->match.changed) ) { @@ -1467,6 +1467,10 @@ _advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, } cfdata->match.changed = 0; } + _comp_mod->conf->match.disable_popups = cfdata->match.disable_popups; + _comp_mod->conf->match.disable_borders = cfdata->match.disable_borders; + _comp_mod->conf->match.disable_overrides = cfdata->match.disable_overrides; + _comp_mod->conf->match.disable_menus = cfdata->match.disable_menus; _comp_mod->conf->lock_fps = cfdata->lock_fps; _comp_mod->conf->smooth_windows = cfdata->smooth_windows; _comp_mod->conf->grab = cfdata->grab; @@ -1598,14 +1602,8 @@ static int _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { - if (cfdata->match.toggle_changed) - { - _comp_mod->conf->match.disable_popups = cfdata->match.disable_popups = cfdata->match.disable_all; - _comp_mod->conf->match.disable_borders = cfdata->match.disable_borders = cfdata->match.disable_all; - _comp_mod->conf->match.disable_overrides = cfdata->match.disable_overrides = cfdata->match.disable_all; - _comp_mod->conf->match.disable_menus = cfdata->match.disable_menus = cfdata->match.disable_all; - } - if ((cfdata->lock_fps != _comp_mod->conf->lock_fps) || + if (cfdata->match.toggle_changed || + (cfdata->lock_fps != _comp_mod->conf->lock_fps) || (cfdata->smooth_windows != _comp_mod->conf->smooth_windows) || (cfdata->grab != _comp_mod->conf->grab) || (cfdata->keep_unmapped != _comp_mod->conf->keep_unmapped) || @@ -1669,6 +1667,13 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, } cfdata->match.changed = 0; } + if (cfdata->match.toggle_changed) + { + _comp_mod->conf->match.disable_popups = cfdata->match.disable_popups = cfdata->match.disable_all; + _comp_mod->conf->match.disable_borders = cfdata->match.disable_borders = cfdata->match.disable_all; + _comp_mod->conf->match.disable_overrides = cfdata->match.disable_overrides = cfdata->match.disable_all; + _comp_mod->conf->match.disable_menus = cfdata->match.disable_menus = cfdata->match.disable_all; + } _comp_mod->conf->lock_fps = cfdata->lock_fps; _comp_mod->conf->smooth_windows = cfdata->smooth_windows; _comp_mod->conf->grab = cfdata->grab; diff --git a/src/modules/conf_comp/e_mod_main.c b/src/modules/conf_comp/e_mod_main.c index fb493e4b6..e36645bfb 100644 --- a/src/modules/conf_comp/e_mod_main.c +++ b/src/modules/conf_comp/e_mod_main.c @@ -119,12 +119,16 @@ e_modapi_init(E_Module *m) co->requires_restart = 1; cfg_opts = eina_inlist_append(cfg_opts, EINA_INLIST_GET(co)); E_CONFIGURE_OPTION_ADD(co, BOOL, match.disable_borders, mod->conf, _("Disable composite effects for windows"), _("composite"), _("border"), _("theme"), _("animate")); + co->funcs[1].none = co->funcs[0].none = e_comp_shadow_set; cfg_opts = eina_inlist_append(cfg_opts, EINA_INLIST_GET(co)); E_CONFIGURE_OPTION_ADD(co, BOOL, match.disable_menus, mod->conf, _("Disable composite effects for menus"), _("composite"), _("menu"), _("theme"), _("animate")); + co->funcs[1].none = co->funcs[0].none = e_comp_shadow_set; cfg_opts = eina_inlist_append(cfg_opts, EINA_INLIST_GET(co)); E_CONFIGURE_OPTION_ADD(co, BOOL, match.disable_popups, mod->conf, _("Disable composite effects for popups"), _("composite"), _("popup"), _("theme"), _("animate")); + co->funcs[1].none = co->funcs[0].none = e_comp_shadow_set; cfg_opts = eina_inlist_append(cfg_opts, EINA_INLIST_GET(co)); E_CONFIGURE_OPTION_ADD(co, BOOL, match.disable_overrides, mod->conf, _("Disable composite effects for override-redirect windows (tooltips and such)"), _("composite"), _("theme"), _("animate")); + co->funcs[1].none = co->funcs[0].none = e_comp_shadow_set; cfg_opts = eina_inlist_append(cfg_opts, EINA_INLIST_GET(co)); E_CONFIGURE_OPTION_ADD(co, BOOL, smooth_windows, mod->conf, _("Smooth scaling of composited window content"), _("composite"), _("border")); co->funcs[1].none = co->funcs[0].none = e_comp_shadow_set;