forked from enlightenment/enlightenment
normalize systray icon size against shelf size
ticket #1945 SVN revision: 80462
This commit is contained in:
parent
4c9d587ecb
commit
0dd759c208
|
@ -324,7 +324,7 @@ _systray_icon_add(Instance *inst, const Ecore_X_Window win)
|
||||||
{
|
{
|
||||||
Ecore_X_Gravity gravity;
|
Ecore_X_Gravity gravity;
|
||||||
Evas_Object *o;
|
Evas_Object *o;
|
||||||
Evas_Coord w, h;
|
int w, h, sz;
|
||||||
Icon *icon;
|
Icon *icon;
|
||||||
|
|
||||||
edje_object_part_geometry_get(inst->ui.gadget, _part_size,
|
edje_object_part_geometry_get(inst->ui.gadget, _part_size,
|
||||||
|
@ -334,6 +334,11 @@ _systray_icon_add(Instance *inst, const Ecore_X_Window win)
|
||||||
else
|
else
|
||||||
h = w;
|
h = w;
|
||||||
|
|
||||||
|
/* assuming systray must be on a shelf here */
|
||||||
|
sz = MIN(inst->gcc->gadcon->shelf->w, inst->gcc->gadcon->shelf->h);
|
||||||
|
if ((w < 16) && (sz > 16))
|
||||||
|
w = h = sz - 5;
|
||||||
|
|
||||||
w = h = e_util_icon_size_normalize(w);
|
w = h = e_util_icon_size_normalize(w);
|
||||||
|
|
||||||
o = evas_object_rectangle_add(inst->evas);
|
o = evas_object_rectangle_add(inst->evas);
|
||||||
|
|
Loading…
Reference in New Issue