enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

systray is effectively the same whether it's in a shelf or on the desktop now, make it work for both

This commit is contained in:
Mike Blumenkrantz 2013-05-28 11:01:50 +01:00
parent 317968efa8
commit 4b8a73b1d9
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/systray/e_mod_main.c
View File

@ -47,12 +47,8 @@ _systray_site_is_safe(E_Gadcon_Site site)
/* NB: filter out sites we know are not safe for a systray to sit.
* This was done so that systray could be put into illume indicator
* (or anywhere else really) that is 'safe' for systray to be.
* Pretty much, this is anywhere but Desktop and toolbars at the moment */
if (e_gadcon_site_is_desktop(site))
return EINA_FALSE;
else if (e_gadcon_site_is_any_toolbar(site))
return EINA_FALSE;
return EINA_TRUE;
* Pretty much, this is anywhere but toolbars at the moment */
return !e_gadcon_site_is_any_toolbar(site);
}
static const char *

5
src/modules/systray/e_mod_xembed.c
View File

@ -221,7 +221,7 @@ _systray_xembed_icon_add(Instance_Xembed *xembed, const Ecore_X_Window win)
{
Ecore_X_Gravity gravity;
Evas_Object *o;
Evas_Coord w, h, sz;
Evas_Coord w, h, sz = 48;
Icon *icon;
edje_object_part_geometry_get(systray_edje_get(xembed->inst), _part_size,
@ -251,8 +251,9 @@ _systray_xembed_icon_add(Instance_Xembed *xembed, const Ecore_X_Window win)
case E_GADCON_ORIENT_CORNER_RT:
case E_GADCON_ORIENT_CORNER_LB:
case E_GADCON_ORIENT_CORNER_RB:
default:
sz = systray_gadcon_get(xembed->inst)->shelf->w;
default:
break;
}
if ((w < 16) && (sz > 16))
w = h = sz - 5;