diff options
| author | Chris Michael <cp.michael@samsung.com> | 2014-06-26 09:29:42 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2014-08-04 18:01:21 -0400 |
| commit | 380dac4102f20dd90e9d834fb39ddbd7f053cb24 (patch) | |
| tree | 720f11864bcab2ffddebf793089273510f366b0a | |
| parent | d7eae25ddaf309bc4e266a22659f93640c7a3619 (diff) | |
| download | enlightenment-380dac4102f20dd90e9d834fb39ddbd7f053cb24.tar.gz | |
use the pointer from the compositor for e_win and don't free the pointer when the window closes
Signed-off-by: Chris Michael <cp.michael@samsung.com>
| -rw-r--r-- | src/bin/e_win.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/bin/e_win.c b/src/bin/e_win.c index 8132022af7..de99d36a59 100644 --- a/src/bin/e_win.c +++ b/src/bin/e_win.c @@ -263,7 +263,7 @@ _e_win_hide(void *obj) if (cb) cb(win); if (!e_object_unref(E_OBJECT(win))) return; - E_FREE_FUNC(win->pointer, e_object_del); + /* E_FREE_FUNC(win->pointer, e_object_del); */ e_canvas_del(win->ecore_evas); ecore_evas_callback_move_set(win->ecore_evas, NULL); ecore_evas_callback_resize_set(win->ecore_evas, NULL); @@ -345,16 +345,14 @@ e_win_new(E_Comp *c) win->max_aspect = 0.0; wins = eina_list_append(wins, win); +// win->pointer = e_pointer_canvas_new(win->ecore_evas, EINA_TRUE); + + win->pointer = c->pointer; + /* if (c->comp_type == E_PIXMAP_TYPE_X) */ - /* { */ - /* win->pointer = e_pointer_window_new(win->evas_win, 1); */ - /* win->pointer->color = c->pointer->color; */ - /* } */ + /* win->pointer = e_pointer_window_new(win->evas_win, EINA_TRUE); */ /* else if (c->comp_type == E_PIXMAP_TYPE_WL) */ - /* { */ - /* win->pointer = e_pointer_canvas_new(win->evas, 1); */ - /* win->pointer->color = c->pointer->color; */ - /* } */ + /* win->pointer = e_pointer_canvas_new(win->ecore_evas, EINA_TRUE); */ return win; } @@ -713,8 +711,8 @@ e_win_client_icon_key_set(E_Win *win, const char *key) static void _e_win_free(E_Win *win) { - if (win->pointer) - e_object_del(E_OBJECT(win->pointer)); + /* if (win->pointer) */ + /* e_object_del(E_OBJECT(win->pointer)); */ if (win->ecore_evas) { @@ -791,7 +789,7 @@ _e_win_cb_destroy(Ecore_Evas *ee) if (win->cb_delete) win->cb_delete(win); win->cb_delete = NULL; e_object_unref(E_OBJECT(win)); - E_FREE_FUNC(win->pointer, e_object_del); + /* E_FREE_FUNC(win->pointer, e_object_del); */ if (!win->client) return; win->client->internal_ecore_evas = NULL; e_canvas_del(ee); |