diff options
| author | Chris Michael <cp.michael@samsung.com> | 2013-03-14 13:04:25 +0000 |
|---|---|---|
| committer | Chris Michael <cp.michael@samsung.com> | 2013-03-21 07:21:46 +0000 |
| commit | 8719fe0111f6130e0f4b7a952b629796fa947b93 (patch) | |
| tree | 23e3a6d610b3ee63add5f78c9c7915d9c8914489 | |
| parent | 23e267da105da8724c85cf4ed1d2eeb64c3f2708 (diff) | |
| download | enlightenment-8719fe0111f6130e0f4b7a952b629796fa947b93.tar.gz | |
Cleanup some code.
Signed-off-by: Chris Michael <cp.michael@samsung.com>
| -rw-r--r-- | src/bin/e_comp_wl.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index b8fa86f7e5..72da74323e 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -716,18 +716,13 @@ _e_comp_wl_cb_surface_create(struct wl_client *client, struct wl_resource *resou ews->pending.buffer_destroy.notify = _e_comp_wl_surface_cb_pending_buffer_destroy; - /* ews->width = 700; */ - /* ews->height = 400; */ - ews->win = e_win_new(e_container_current_get(e_manager_current_get())); e_win_borderless_set(ews->win, EINA_TRUE); e_win_shaped_set(ews->win, EINA_TRUE); - /* e_win_move_resize(ews->win, 0, 0, ews->width, ews->height); */ /* e_object_data_set(E_OBJECT(ews->win), ews); */ ews->img = evas_object_image_filled_add(e_win_evas_get(ews->win)); evas_object_move(ews->img, 0, 0); - /* evas_object_resize(ews->img, ews->width, ews->height); */ evas_object_show(ews->img); evas_event_callback_add(e_win_evas_get(ews->win), @@ -761,7 +756,6 @@ _e_comp_wl_cb_surface_destroy(struct wl_resource *resource) Eina_List *l; EINA_LIST_FOREACH(_e_wl_comp->wl.lists.seat, l, input) -// wl_list_for_each(input, &_e_wl_comp->wl.lists.seat, wl.link) { if ((input->wl.seat.keyboard) && (input->wl.seat.keyboard->focus == &ews->wl.surface)) @@ -771,7 +765,8 @@ _e_comp_wl_cb_surface_destroy(struct wl_resource *resource) wl_pointer_set_focus(input->wl.seat.pointer, NULL, 0, 0); } - e_win_hide(ews->win); + if (ews->win->border) + e_win_hide(ews->win); ews->mapped = EINA_FALSE; } @@ -1031,8 +1026,7 @@ _e_comp_wl_surface_cb_commit(struct wl_client *client EINA_UNUSED, struct wl_res { ews->width = bw; ews->height = bh; - e_win_resize(ews->win, bw, bh); - + if (ews->win) e_win_resize(ews->win, bw, bh); evas_object_resize(ews->img, bw, bh); } |