vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix illume-indicator window leaving a 'black bar' behind ... when Comp 

module is enabled. The previous fix worked without Composite module
just fine, but did not account for the way that Composite works. This
fix works in both cases, with Composite and without.

Thanks to Jeff Hoogland for bringing that to my attention ;)



SVN revision: 56229
This commit is contained in:
Christopher Michael 2011-01-20 00:05:52 +00:00
parent 5089648a12
commit a19942672d
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/modules/illume-indicator/e_mod_ind_win.c
View File

@ -20,8 +20,8 @@ static void _e_mod_ind_win_cb_menu_pre(void *data, E_Menu *mn);
static void _e_mod_ind_win_cb_menu_post(void *data, E_Menu *mn __UNUSED__);
static void _e_mod_ind_win_cb_menu_contents(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNUSED__);
static void _e_mod_ind_win_cb_menu_edit(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNUSED__);
static void _e_mod_ind_win_cb_show(Ecore_Evas *ee);
static void _e_mod_ind_win_cb_hide(Ecore_Evas *ee);
static Eina_Bool _e_mod_ind_win_cb_border_hide(void *data, int type __UNUSED__, void *event);
static Eina_Bool _e_mod_ind_win_cb_border_show(void *data, int type __UNUSED__, void *event);
Ind_Win *
e_mod_ind_win_new(E_Zone *zone)
@ -126,6 +126,18 @@ e_mod_ind_win_new(E_Zone *zone)
_e_mod_ind_win_cb_zone_resize,
iwin));
iwin->hdls =
eina_list_append(iwin->hdls,
ecore_event_handler_add(E_EVENT_BORDER_HIDE,
_e_mod_ind_win_cb_border_hide,
iwin));
iwin->hdls =
eina_list_append(iwin->hdls,
ecore_event_handler_add(E_EVENT_BORDER_SHOW,
_e_mod_ind_win_cb_border_show,
iwin));
/* 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);
@ -138,12 +150,6 @@ e_mod_ind_win_new(E_Zone *zone)
e_win_show(iwin->win);
e_popup_show(iwin->popup);
/* setup callbacks for show/hide so we can do the proper thing with the
* popup */
ecore_evas_data_set(iwin->win->ecore_evas, "iwin", iwin);
ecore_evas_callback_show_set(iwin->win->ecore_evas, _e_mod_ind_win_cb_show);
ecore_evas_callback_hide_set(iwin->win->ecore_evas, _e_mod_ind_win_cb_hide);
/* set this window on proper zone */
e_border_zone_set(iwin->win->border, zone);
iwin->win->border->user_skip_winlist = 1;
@ -548,20 +554,28 @@ _e_mod_ind_win_cb_menu_edit(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi _
e_gadcon_edit_begin(iwin->gadcon);
}
static void
_e_mod_ind_win_cb_show(Ecore_Evas *ee)
static Eina_Bool
_e_mod_ind_win_cb_border_hide(void *data, int type __UNUSED__, void *event)
{
Ind_Win *iwin;
E_Event_Border_Hide *ev;
iwin = ecore_evas_data_get(ee, "iwin");
e_popup_show(iwin->popup);
}
static void
_e_mod_ind_win_cb_hide(Ecore_Evas *ee)
{
Ind_Win *iwin;
iwin = ecore_evas_data_get(ee, "iwin");
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);
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool
_e_mod_ind_win_cb_border_show(void *data, int type __UNUSED__, void *event)
{
Ind_Win *iwin;
E_Event_Border_Show *ev;
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);
return ECORE_CALLBACK_PASS_ON;
}