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:
parent
317968efa8
commit
4b8a73b1d9
|
@ -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.
|
/* 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
|
* This was done so that systray could be put into illume indicator
|
||||||
* (or anywhere else really) that is 'safe' for systray to be.
|
* (or anywhere else really) that is 'safe' for systray to be.
|
||||||
* Pretty much, this is anywhere but Desktop and toolbars at the moment */
|
* Pretty much, this is anywhere but toolbars at the moment */
|
||||||
if (e_gadcon_site_is_desktop(site))
|
return !e_gadcon_site_is_any_toolbar(site);
|
||||||
return EINA_FALSE;
|
|
||||||
else if (e_gadcon_site_is_any_toolbar(site))
|
|
||||||
return EINA_FALSE;
|
|
||||||
return EINA_TRUE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *
|
static const char *
|
||||||
|
|
|
@ -221,7 +221,7 @@ _systray_xembed_icon_add(Instance_Xembed *xembed, const Ecore_X_Window win)
|
||||||
{
|
{
|
||||||
Ecore_X_Gravity gravity;
|
Ecore_X_Gravity gravity;
|
||||||
Evas_Object *o;
|
Evas_Object *o;
|
||||||
Evas_Coord w, h, sz;
|
Evas_Coord w, h, sz = 48;
|
||||||
Icon *icon;
|
Icon *icon;
|
||||||
|
|
||||||
edje_object_part_geometry_get(systray_edje_get(xembed->inst), _part_size,
|
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_RT:
|
||||||
case E_GADCON_ORIENT_CORNER_LB:
|
case E_GADCON_ORIENT_CORNER_LB:
|
||||||
case E_GADCON_ORIENT_CORNER_RB:
|
case E_GADCON_ORIENT_CORNER_RB:
|
||||||
default:
|
|
||||||
sz = systray_gadcon_get(xembed->inst)->shelf->w;
|
sz = systray_gadcon_get(xembed->inst)->shelf->w;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
if ((w < 16) && (sz > 16))
|
if ((w < 16) && (sz > 16))
|
||||||
w = h = sz - 5;
|
w = h = sz - 5;
|
||||||
|
|
Loading…
Reference in New Issue