vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

conf dialog code cleanup and "check changed" call. 

I did these while hunting for "buttons not auto-enabled" but that
problem ended to be in e_widget that I fixed already. They should be
harmless, so here they go.



SVN revision: 41884
This commit is contained in:
Gustavo Sverzut Barbieri 2009-08-20 11:45:33 +00:00
parent 0b404ef163
commit 93fe3161c5
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/modules/conf_mouse/e_int_config_mouse.c
View File

@ -5,6 +5,7 @@ static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata); E_Config_Dialog_Data *cfdata);
static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
struct _E_Config_Dialog_Data struct _E_Config_Dialog_Data
{ {
@ -26,12 +27,12 @@ e_int_config_mouse(E_Container *con, const char *params __UNUSED__)
return NULL; return NULL;
v = E_NEW(E_Config_Dialog_View, 1); v = E_NEW(E_Config_Dialog_View, 1);
if (!v) return NULL;
v->create_cfdata = _create_data; v->create_cfdata = _create_data;
v->free_cfdata = _free_data; v->free_cfdata = _free_data;
v->basic.apply_cfdata = _basic_apply_data; v->basic.apply_cfdata = _basic_apply_data;
v->basic.create_widgets = _basic_create_widgets; v->basic.create_widgets = _basic_create_widgets;
v->override_auto_apply = 1; v->basic.check_changed = _basic_check_changed;
cfd = e_config_dialog_new(con, _("Mouse Settings"), "E", cfd = e_config_dialog_new(con, _("Mouse Settings"), "E",
"_config_mouse_dialog", "_config_mouse_dialog",
@ -60,11 +61,18 @@ _create_data(E_Config_Dialog *cfd)
return cfdata; return cfdata;
} }
static int
_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
return !((cfdata->mouse_hand == e_config->mouse_hand) &&
(cfdata->numerator == e_config->mouse_accel_numerator) &&
(cfdata->denominator == e_config->mouse_accel_denominator) &&
(cfdata->threshold == e_config->mouse_accel_threshold));
}
static void static void
_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{ {
if (!cfdata) return;
E_FREE(cfdata); E_FREE(cfdata);
} }
@ -73,10 +81,8 @@ static int
_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{ {
e_config->mouse_hand = cfdata->mouse_hand; e_config->mouse_hand = cfdata->mouse_hand;
e_config->mouse_accel_numerator = cfdata->numerator; e_config->mouse_accel_numerator = cfdata->numerator;
/* Force denominator to 1 for simplicity. */ e_config->mouse_accel_denominator = cfdata->denominator;
e_config->mouse_accel_denominator = 1;
e_config->mouse_accel_threshold = cfdata->threshold; e_config->mouse_accel_threshold = cfdata->threshold;
/* Apply the above settings */ /* Apply the above settings */