From 3d1e0180a293a349988b93f54fd8884c3451f16f Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Wed, 8 Feb 2012 22:57:07 +0000 Subject: [PATCH] Illume: Remove the popup. It's not needed now. NB: Once again, the Old Man is correct ;) SVN revision: 67773 --- src/modules/illume-indicator/e_mod_ind_win.c | 23 +++----------------- src/modules/illume-indicator/e_mod_ind_win.h | 1 - 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/modules/illume-indicator/e_mod_ind_win.c b/src/modules/illume-indicator/e_mod_ind_win.c index 4a593fd65..d3657d6e3 100644 --- a/src/modules/illume-indicator/e_mod_ind_win.c +++ b/src/modules/illume-indicator/e_mod_ind_win.c @@ -57,11 +57,6 @@ e_mod_ind_win_new(E_Zone *zone) /* set this window to not accept or take focus */ ecore_x_icccm_hints_set(iwin->win->evas_win, 0, 0, 0, 0, 0, 0, 0); - /* create the popup */ - iwin->popup = e_popup_new(zone, 0, 0, zone->w, h); - e_popup_name_set(iwin->popup, "indicator"); - e_popup_layer_set(iwin->popup, 200); - /* create our event rectangle */ iwin->o_event = evas_object_rectangle_add(iwin->win->evas); evas_object_color_set(iwin->o_event, 0, 0, 0, 0); @@ -90,8 +85,6 @@ e_mod_ind_win_new(E_Zone *zone) evas_object_move(iwin->o_base, 0, 0); evas_object_show(iwin->o_base); - e_popup_edje_bg_object_set(iwin->popup, iwin->o_base); - /* create our gadget container */ iwin->gadcon = e_gadcon_swallowed_new("illume-indicator", zone->id, iwin->o_base, "e.swallow.content"); @@ -140,15 +133,12 @@ e_mod_ind_win_new(E_Zone *zone) /* set minimum size of this window & popup */ e_win_size_min_set(iwin->win, zone->w, h); - ecore_evas_size_min_set(iwin->popup->ecore_evas, zone->w, h); /* position and resize this window */ e_win_move_resize(iwin->win, zone->x, zone->y, zone->w, h); - e_popup_move_resize(iwin->popup, zone->x, zone->y, zone->w, h); /* show the window */ e_win_show(iwin->win); - e_popup_show(iwin->popup); /* set this window on proper zone */ e_border_zone_set(iwin->win->border, zone); @@ -198,9 +188,6 @@ _e_mod_ind_win_cb_free(Ind_Win *iwin) /* tell conformant apps our position and size */ ecore_x_e_illume_indicator_geometry_set(iwin->zone->black_win, 0, 0, 0, 0); - if (iwin->popup) e_object_del(E_OBJECT(iwin->popup)); - iwin->popup = NULL; - /* delete the window */ if (iwin->win) e_object_del(E_OBJECT(iwin->win)); iwin->win = NULL; @@ -227,7 +214,6 @@ _e_mod_ind_win_cb_win_prop(void *data, int type __UNUSED__, void *event) /* set minimum size of this window */ e_win_size_min_set(iwin->win, iwin->zone->w, h); - ecore_evas_size_min_set(iwin->popup->ecore_evas, iwin->zone->w, h); /* NB: Not sure why, but we need to tell this border to fetch icccm * size position hints now :( (NOTE: This was not needed a few days ago) @@ -236,7 +222,6 @@ _e_mod_ind_win_cb_win_prop(void *data, int type __UNUSED__, void *event) /* resize this window */ e_win_resize(iwin->win, iwin->zone->w, h); - e_popup_resize(iwin->popup, iwin->zone->w, h); /* tell conformant apps our position and size */ ecore_x_e_illume_indicator_geometry_set(iwin->zone->black_win, @@ -261,7 +246,6 @@ _e_mod_ind_win_cb_zone_resize(void *data, int type __UNUSED__, void *event) /* set minimum size of this window to match zone size */ e_win_size_min_set(iwin->win, ev->zone->w, h); - ecore_evas_size_min_set(iwin->popup->ecore_evas, ev->zone->w, h); return ECORE_CALLBACK_PASS_ON; } @@ -272,7 +256,6 @@ _e_mod_ind_win_cb_resize(E_Win *win) Ind_Win *iwin; if (!(iwin = win->data)) return; - if (iwin->popup) e_popup_resize(iwin->popup, win->w, win->h); if (iwin->o_event) evas_object_resize(iwin->o_event, win->w, win->h); if (iwin->o_base) evas_object_resize(iwin->o_base, win->w, win->h); if (iwin->gadcon->o_container) @@ -444,7 +427,7 @@ _e_mod_ind_win_cb_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj bd->y = ny; bd->changes.pos = 1; bd->changed = 1; - e_popup_move(iwin->popup, iwin->popup->x, ny); + e_win_move(iwin->win, iwin->win->x, ny); } } } @@ -570,7 +553,7 @@ _e_mod_ind_win_cb_border_hide(void *data, int type __UNUSED__, void *event) if (!(iwin = data)) return ECORE_CALLBACK_PASS_ON; ev = event; if (ev->border != iwin->win->border) return ECORE_CALLBACK_PASS_ON; - e_popup_hide(iwin->popup); + e_win_hide(iwin->win); return ECORE_CALLBACK_PASS_ON; } @@ -583,6 +566,6 @@ _e_mod_ind_win_cb_border_show(void *data, int type __UNUSED__, void *event) if (!(iwin = data)) return ECORE_CALLBACK_PASS_ON; ev = event; if (ev->border != iwin->win->border) return ECORE_CALLBACK_PASS_ON; - e_popup_show(iwin->popup); + e_win_show(iwin->win); return ECORE_CALLBACK_PASS_ON; } diff --git a/src/modules/illume-indicator/e_mod_ind_win.h b/src/modules/illume-indicator/e_mod_ind_win.h index d41a86106..aa2dd1ca6 100644 --- a/src/modules/illume-indicator/e_mod_ind_win.h +++ b/src/modules/illume-indicator/e_mod_ind_win.h @@ -14,7 +14,6 @@ struct _Ind_Win Eina_List *hdls; E_Win *win; - E_Popup *popup; Evas_Object *o_base, *o_event; E_Gadcon *gadcon; E_Menu *menu;