From 528a86335e481ff9adb1bbadf1ea630d3f967d00 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Wed, 28 Jul 2010 18:45:54 +0000 Subject: [PATCH] Play nice w/ small resolutions. SVN revision: 50606 --- .../e_int_config_interaction.c | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/modules/conf_interaction/e_int_config_interaction.c b/src/modules/conf_interaction/e_int_config_interaction.c index 124a65b8f..922a9f111 100644 --- a/src/modules/conf_interaction/e_int_config_interaction.c +++ b/src/modules/conf_interaction/e_int_config_interaction.c @@ -3,8 +3,8 @@ static void *_create_data(E_Config_Dialog *cfd); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _basic_check_changed(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, E_Config_Dialog_Data *cfdata); +static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static void _enabled_cb(void *data, Evas_Object *obj, void *event_info); struct _E_Config_Dialog_Data @@ -28,13 +28,12 @@ e_int_config_interaction(E_Container *con, const char *params __UNUSED__) v->create_cfdata = _create_data; v->free_cfdata = _free_data; - v->basic.apply_cfdata = _basic_apply_data; - v->basic.create_widgets = _basic_create_widgets; + v->basic.apply_cfdata = _basic_apply; + v->basic.create_widgets = _basic_create; v->basic.check_changed = _basic_check_changed; v->override_auto_apply = 1; - cfd = e_config_dialog_new(con, - _("Interaction Settings"), + cfd = e_config_dialog_new(con, _("Interaction Settings"), "E", "keyboard_and_mouse/interaction", "preferences-interaction", 0, v, NULL); return cfd; @@ -76,7 +75,7 @@ _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) } static int -_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { e_config->thumbscroll_enable = cfdata->thumbscroll_enable; e_config->thumbscroll_threshhold = cfdata->thumbscroll_threshhold; @@ -88,7 +87,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *of, *ob; @@ -104,7 +103,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf e_widget_framelist_object_append(of, ob); cfdata->l1 = ob; ob = e_widget_slider_add(evas, 1, 0, _("%1.0f pixels"), 0, 64, 4, 0, NULL, - &(cfdata->thumbscroll_threshhold), 200); + &(cfdata->thumbscroll_threshhold), 100); e_widget_framelist_object_append(of, ob); cfdata->sl1 = ob; @@ -113,7 +112,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf cfdata->l2 = ob; ob = e_widget_slider_add(evas, 1, 0, _("%1.0f pixels/sec"), 0, 2000, 20, 0, &(cfdata->thumbscroll_momentum_threshhold), - NULL, 200); + NULL, 100); e_widget_framelist_object_append(of, ob); cfdata->sl2 = ob; @@ -121,7 +120,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf e_widget_framelist_object_append(of, ob); cfdata->l3 = ob; ob = e_widget_slider_add(evas, 1, 0, _("%1.2f sec"), 0.00, 5.0, 0.1, 0, - &(cfdata->thumbscroll_friction), NULL, 200); + &(cfdata->thumbscroll_friction), NULL, 100); e_widget_framelist_object_append(of, ob); cfdata->sl3 = ob;