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

use correct geom for systray icon scaling, also clamp to shelf size 

SVN revision: 80596
This commit is contained in:
Mike Blumenkrantz 2012-12-10 11:30:33 +00:00
parent 2c4e269031
commit 214c57e210
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,11 +335,34 @@ _systray_icon_add(Instance *inst, const Ecore_X_Window win)
h = w;
/* assuming systray must be on a shelf here */
sz = MIN(inst->gcc->gadcon->shelf->w, inst->gcc->gadcon->shelf->h);
switch (inst->gcc->gadcon->orient)
{
case E_GADCON_ORIENT_HORIZ:
case E_GADCON_ORIENT_TOP:
case E_GADCON_ORIENT_BOTTOM:
case E_GADCON_ORIENT_CORNER_TL:
case E_GADCON_ORIENT_CORNER_TR:
case E_GADCON_ORIENT_CORNER_BL:
case E_GADCON_ORIENT_CORNER_BR:
sz = inst->gcc->gadcon->shelf->h;
break;
case E_GADCON_ORIENT_VERT:
case E_GADCON_ORIENT_LEFT:
case E_GADCON_ORIENT_RIGHT:
case E_GADCON_ORIENT_CORNER_LT:
case E_GADCON_ORIENT_CORNER_RT:
case E_GADCON_ORIENT_CORNER_LB:
case E_GADCON_ORIENT_CORNER_RB:
default:
sz = inst->gcc->gadcon->shelf->w;
}
if ((w < 16) && (sz > 16))
w = h = sz - 5;
w = h = e_util_icon_size_normalize(w);
if (w > sz - 5)
w = h = e_util_icon_size_normalize(sz - 5);
o = evas_object_rectangle_add(inst->evas);
if (!o)