From 5dfb8905cbaea51726fde5f0989b902ae5642823 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 1 Nov 2005 09:49:03 +0000 Subject: [PATCH] support REDRAW_DEBUG env var SVN revision: 18187 --- src/bin/e_container.c | 5 ++++- src/bin/e_int_config_focus.c | 3 ++- src/bin/e_int_config_focus.h | 2 +- src/bin/e_test.c | 37 +++++------------------------------- 4 files changed, 12 insertions(+), 35 deletions(-) diff --git a/src/bin/e_container.c b/src/bin/e_container.c index 73f22f235..764fb0739 100644 --- a/src/bin/e_container.c +++ b/src/bin/e_container.c @@ -97,7 +97,10 @@ e_container_new(E_Manager *man) con->bg_evas = ecore_evas_get(con->bg_ecore_evas); ecore_evas_name_class_set(con->bg_ecore_evas, "E", "Background_Window"); ecore_evas_title_set(con->bg_ecore_evas, "Enlightenment Background"); - ecore_evas_avoid_damage_set(con->bg_ecore_evas, 1); + if (getenv("REDRAW_DEBUG")) + ecore_evas_avoid_damage_set(con->bg_ecore_evas, !atoi(getenv("REDRAW_DEBUG"))); + else + ecore_evas_avoid_damage_set(con->bg_ecore_evas, 1); ecore_x_window_lower(con->bg_win); o = evas_object_rectangle_add(con->bg_evas); diff --git a/src/bin/e_int_config_focus.c b/src/bin/e_int_config_focus.c index 9c7acf802..864bd17d2 100644 --- a/src/bin/e_int_config_focus.c +++ b/src/bin/e_int_config_focus.c @@ -27,7 +27,7 @@ struct _CFData }; /* a nice easy setup function that does the dirty work */ -void +E_Config_Dialog * e_int_config_focus(E_Container *con) { E_Config_Dialog *cfd; @@ -42,6 +42,7 @@ e_int_config_focus(E_Container *con) v.advanced.create_widgets = _advanced_create_widgets; /* create config diaolg for NULL object/data */ cfd = e_config_dialog_new(con, _("Focus Settings"), NULL, 0, &v, NULL); + return cfd; } /**--CREATE--**/ diff --git a/src/bin/e_int_config_focus.h b/src/bin/e_int_config_focus.h index 5668cba03..4e9ed3e3a 100644 --- a/src/bin/e_int_config_focus.h +++ b/src/bin/e_int_config_focus.h @@ -6,7 +6,7 @@ #ifndef E_INT_CONFIG_FOCUS_H #define E_INT_CONFIG_FOCUS_H -EAPI void e_int_config_focus(E_Container *con); +EAPI E_Config_Dialog *e_int_config_focus(E_Container *con); #endif #endif diff --git a/src/bin/e_test.c b/src/bin/e_test.c index ced3e27a3..3b301d5d4 100644 --- a/src/bin/e_test.c +++ b/src/bin/e_test.c @@ -356,36 +356,9 @@ _e_test_internal(E_Container *con) static E_Dialog * _e_test_dia(E_Container *con) { - E_Dialog *dia; - Evas_Object *o, *o2, *o3; + E_Config_Dialog *dia; - dia = e_dialog_new(con); - e_dialog_title_set(dia, "A Test Dialog"); - - o = e_icon_add(dia->win->evas); -// e_icon_file_set(o, "/home/raster/t.png"); - evas_object_resize(o, 1024, 768); - evas_object_focus_set(o, 1); - evas_object_show(o); - - o2 = e_scrollframe_add(dia->win->evas); -// e_scrollframe_custom_theme_set(o2, "base/theme/widgets", "widgets/scrollframe"); - evas_object_resize(o2, 200, 300); - evas_object_show(o2); -#if 0 - o3 = e_pan_add(dia->win->evas); - e_pan_child_set(o3, o); - e_scrollframe_extern_pan_set(o2, o3, e_pan_set, e_pan_get, e_pan_max_get, e_pan_child_size_get); -#else - e_scrollframe_child_set(o2, o); -#endif - - e_dialog_content_set(dia, o2, 500, 300); - e_dialog_button_add(dia, "OK", NULL, NULL, NULL); - e_win_centered_set(dia->win, 1); - e_dialog_show(dia); - - evas_object_focus_set(o, 1); + dia = e_int_config_focus(con); return dia; } @@ -394,18 +367,18 @@ static E_Container *tcon = NULL; static int _e_test_timer(void *data) { - E_Dialog *dia; + E_Config_Dialog *dia; if (data == NULL) { dia = _e_test_dia(tcon); - ecore_timer_add(0.5, _e_test_timer, dia); + ecore_timer_add(0.2, _e_test_timer, dia); } else { dia = data; e_object_del(E_OBJECT(dia)); - ecore_timer_add(0.5, _e_test_timer, NULL); + ecore_timer_add(0.2, _e_test_timer, NULL); } return 0; }