From: Enlightenment S. <no-...@en...> - 2010-02-28 18:49:07
|
Log: Don't expand list. That causes slider labels to look like poo. Fix formatting & remove whitespace. Author: devilhorns Date: 2010-02-28 10:49:01 -0800 (Sun, 28 Feb 2010) New Revision: 46664 Modified: trunk/e/src/modules/conf_interaction/e_int_config_interaction.c Modified: trunk/e/src/modules/conf_interaction/e_int_config_interaction.c =================================================================== --- trunk/e/src/modules/conf_interaction/e_int_config_interaction.c 2010-02-28 18:45:07 UTC (rev 46663) +++ trunk/e/src/modules/conf_interaction/e_int_config_interaction.c 2010-02-28 18:49:01 UTC (rev 46664) @@ -1,11 +1,10 @@ #include "e.h" -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 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 void _enabled_cb(void *data, Evas_Object *obj, void *event_info); struct _E_Config_Dialog_Data @@ -23,7 +22,8 @@ E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (e_config_dialog_find("E", "keyboard_and_mouse/interaction")) return NULL; + if (e_config_dialog_find("E", "keyboard_and_mouse/interaction")) + return NULL; v = E_NEW(E_Config_Dialog_View, 1); v->create_cfdata = _create_data; @@ -32,7 +32,7 @@ v->basic.create_widgets = _basic_create_widgets; v->basic.check_changed = _basic_check_changed; v->override_auto_apply = 1; - + cfd = e_config_dialog_new(con, _("Interaction Settings"), "E", "keyboard_and_mouse/interaction", @@ -45,7 +45,8 @@ { cfdata->thumbscroll_enable = e_config->thumbscroll_enable; cfdata->thumbscroll_threshhold = e_config->thumbscroll_threshhold; - cfdata->thumbscroll_momentum_threshhold = e_config->thumbscroll_momentum_threshhold; + cfdata->thumbscroll_momentum_threshhold = + e_config->thumbscroll_momentum_threshhold; cfdata->thumbscroll_friction = e_config->thumbscroll_friction; } @@ -79,7 +80,8 @@ { e_config->thumbscroll_enable = cfdata->thumbscroll_enable; e_config->thumbscroll_threshhold = cfdata->thumbscroll_threshhold; - e_config->thumbscroll_momentum_threshhold = cfdata->thumbscroll_momentum_threshhold; + e_config->thumbscroll_momentum_threshhold = + cfdata->thumbscroll_momentum_threshhold; e_config->thumbscroll_friction = cfdata->thumbscroll_friction; e_config_save_queue(); return 1; @@ -89,32 +91,37 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *of, *ob; - + o = e_widget_list_add(evas, 0, 0); of = e_widget_framelist_add(evas, _("Thumbscroll"), 0); - ob = e_widget_check_add(evas, _("Enable Thumbscroll"), &(cfdata->thumbscroll_enable)); + ob = e_widget_check_add(evas, _("Enable Thumbscroll"), + &(cfdata->thumbscroll_enable)); e_widget_framelist_object_append(of, ob); evas_object_smart_callback_add(ob, "changed", _enabled_cb, cfdata); - + ob = e_widget_label_add(evas, _("Threshold for a thumb drag")); 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); + ob = e_widget_slider_add(evas, 1, 0, _("%1.0f pixels"), 0, 64, 4, 0, NULL, + &(cfdata->thumbscroll_threshhold), 200); e_widget_framelist_object_append(of, ob); cfdata->sl1 = ob; - + ob = e_widget_label_add(evas, _("Threshold for applying drag momentum")); e_widget_framelist_object_append(of, ob); 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); + ob = e_widget_slider_add(evas, 1, 0, _("%1.0f pixels/sec"), 0, 2000, 20, 0, + &(cfdata->thumbscroll_momentum_threshhold), + NULL, 200); e_widget_framelist_object_append(of, ob); cfdata->sl2 = ob; - + ob = e_widget_label_add(evas, _("Friction slowdown")); 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); + ob = e_widget_slider_add(evas, 1, 0, _("%1.2f sec"), 0.00, 5.0, 0.1, 0, + &(cfdata->thumbscroll_friction), NULL, 200); e_widget_framelist_object_append(of, ob); cfdata->sl3 = ob; @@ -128,7 +135,7 @@ e_widget_disabled_set(cfdata->sl3, 1); } - e_widget_list_object_append(o, of, 1, 1, 0.5); + e_widget_list_object_append(o, of, 1, 0, 0.5); return o; } |