From 2a3f77d8f68b6b0ea299fa2de7c9751648ca1f87 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Thu, 27 Oct 2005 03:31:57 +0000 Subject: [PATCH] remove useless test (doesnt work anymore) and make e win popdown/destruction slicker SVN revision: 18003 --- src/bin/e_test.c | 97 ------------------------------------------------ src/bin/e_win.c | 17 ++++++++- 2 files changed, 16 insertions(+), 98 deletions(-) diff --git a/src/bin/e_test.c b/src/bin/e_test.c index 199b19e78..b9da9ee5b 100644 --- a/src/bin/e_test.c +++ b/src/bin/e_test.c @@ -307,103 +307,6 @@ _e_test_internal(E_Container *con) e_win_centered_set(dia->win, 1); e_dialog_show(dia); } -#elif 0 -static int my_val = 0; -static int my_val2 = 0; -static int my_val3 = 0; -static int my_val4 = 0; -static int my_val5 = 0; -static int my_val6 = 0; -static int my_rval = 1; -static int my_rval2 = 1; - -static void -_e_test_internal(E_Container *con) -{ - E_Dialog *dia; - - dia = e_dialog_new(con); - e_dialog_title_set(dia, "A Test Dialog"); - { - Evas_Object *o, *ol, *hb; - Evas_Coord mw, mh; - E_Radio_Group *rg; - Evas *e; - - e = e_win_evas_get(dia->win); - - ol = e_widget_list_add(e, 0, 0); - - hb = e_widget_list_add(e, 1, 1); - - o = e_widget_framelist_add(e, "My Checklist", 0); - - e_widget_framelist_object_append(o, e_widget_check_add(e, "Checkbox 1", &my_val)); - e_widget_framelist_object_append(o, e_widget_check_add(e, "Checkbox 2", &my_val2)); - e_widget_framelist_object_append(o, e_widget_check_add(e, "Checkbox 3", &my_val3)); - e_widget_framelist_object_append(o, e_widget_check_add(e, "Checkbox and some long text", &my_val4)); - e_widget_framelist_object_append(o, e_widget_check_add(e, "Checkbox 7", &my_val5)); - e_widget_framelist_object_append(o, e_widget_check_add(e, "Koneko", &my_val6)); - - rg = e_widget_radio_group_new(&my_rval); - e_widget_framelist_object_append(o, e_widget_radio_add(e, "Rad 0", 0, rg)); - e_widget_framelist_object_append(o, e_widget_radio_add(e, "Rad 1", 1, rg)); - e_widget_framelist_object_append(o, e_widget_radio_add(e, "Rad 2", 2, rg)); - e_widget_framelist_object_append(o, e_widget_radio_add(e, "Rad 3", 3, rg)); - e_widget_framelist_object_append(o, e_widget_radio_add(e, "Rad 4", 4, rg)); - - e_widget_list_object_append(hb, o, 1, 1, 0.5); - - o = e_widget_framelist_add(e, "My Checklist on the right", 0); - - rg = e_widget_radio_group_new(&my_rval2); - e_widget_framelist_object_append(o, e_widget_radio_add(e, "Rad 0", 0, rg)); - e_widget_framelist_object_append(o, e_widget_radio_add(e, "Rad 1", 1, rg)); - e_widget_framelist_object_append(o, e_widget_radio_add(e, "Rad 2", 2, rg)); - e_widget_framelist_object_append(o, e_widget_radio_add(e, "Rad 3", 3, rg)); - e_widget_framelist_object_append(o, e_widget_radio_add(e, "Rad 4", 4, rg)); - - e_widget_list_object_append(hb, o, 0, 0, 0.0); - - o = e_widget_frametable_add(e, "My Frame Table", 0); - - e_widget_frametable_object_append(o, e_widget_check_add(e, "L1", &my_val), - 0, 0, 1, 1, - 1, 1, 1, 1); - e_widget_frametable_object_append(o, e_widget_check_add(e, "L2", &my_val), - 1, 0, 1, 1, - 1, 1, 1, 1); - e_widget_frametable_object_append(o, e_widget_check_add(e, "L3", &my_val), - 2, 0, 1, 1, - 1, 1, 1, 1); - - e_widget_frametable_object_append(o, e_widget_check_add(e, "One", &my_val), - 0, 1, 1, 1, - 1, 1, 1, 1); - e_widget_frametable_object_append(o, e_widget_check_add(e, "This spans 2", &my_val), - 1, 1, 2, 1, - 1, 1, 1, 1); - - e_widget_frametable_object_append(o, e_widget_check_add(e, "A Really Long Checkbox at the bottom", &my_val), - 0, 2, 3, 1, - 1, 1, 1, 1); - - e_widget_list_object_append(hb, o, 0, 0, 0.5); - - e_widget_list_object_append(ol, hb, 1, 1, 0.5); - - o = e_widget_button_add(e, "Button", "enlightenment/exit", NULL, NULL, NULL); - e_widget_list_object_append(ol, o, 0, 0, 1.0); - - e_widget_min_size_get(ol, &mw, &mh); - e_dialog_content_set(dia, ol, mw, mh); - } - e_dialog_button_add(dia, "OK", NULL, NULL, NULL); - e_dialog_button_add(dia, "Apply", "enlightenment/reset", NULL, NULL); - e_dialog_button_add(dia, "Cancel", "enlightenment/exit", NULL, NULL); - e_win_centered_set(dia->win, 1); - e_dialog_show(dia); -} #else static void _e_test_internal(E_Container *con) diff --git a/src/bin/e_win.c b/src/bin/e_win.c index 27d0b3623..3ae625ed6 100644 --- a/src/bin/e_win.c +++ b/src/bin/e_win.c @@ -5,6 +5,7 @@ /* local subsystem functions */ static void _e_win_free(E_Win *win); +static void _e_win_del(void *obj); static void _e_win_prop_update(E_Win *win); static void _e_win_state_update(E_Win *win); static void _e_win_cb_move(Ecore_Evas *ee); @@ -40,6 +41,7 @@ e_win_new(E_Container *con) win = E_OBJECT_ALLOC(E_Win, E_WIN_TYPE, _e_win_free); if (!win) return NULL; + e_object_del_func_set(E_OBJECT(win), _e_win_del); win->container = con; win->engine = e_canvas_engine_decide(e_config->evas_engine_win); win->ecore_evas = e_canvas_new(e_config->evas_engine_win, con->manager->root, @@ -344,11 +346,24 @@ _e_win_free(E_Win *win) { e_canvas_del(win->ecore_evas); ecore_evas_free(win->ecore_evas); - if (win->border) e_object_del(E_OBJECT(win->border)); + if (win->border) + { + e_border_hide(win->border, 1); + e_object_del(E_OBJECT(win->border)); + } wins = evas_list_remove(wins, win); free(win); } +static void +_e_win_del(void *obj) +{ + E_Win *win; + + win = obj; + if (win->border) e_border_hide(win->border, 1); +} + static void _e_win_prop_update(E_Win *win) {