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

clamp ibar menu location to ibar zone 

fix T1170

fix T1174
This commit is contained in:
Mike Blumenkrantz 2014-05-07 12:06:25 -04:00
parent 0b6b75939e
commit aff4f3516f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/ibar/e_mod_main.c
View File

@ -1168,6 +1168,7 @@ _ibar_icon_menu_recalc(IBar_Icon *ic)
{
int x, y, w, h, iw, ih, ox, oy;
Evas_Object *o;
E_Zone *zone;
o = ic->menu->o_bg;
@ -1179,10 +1180,13 @@ _ibar_icon_menu_recalc(IBar_Icon *ic)
e_gadcon_popup_show(ic->menu);
evas_object_geometry_get(ic->o_holder, &x, &y, &iw, &ih);
evas_object_geometry_get(ic->menu->comp_object, &ox, &oy, NULL, NULL);
zone = e_gadcon_zone_get(ic->ibar->inst->gcc->gadcon);
if (e_box_orientation_get(ic->ibar->o_box))
ox = (x + (iw / 2)) - (w / 2);
else
oy = (y + (ih / 2)) - (h / 2);
ox = E_CLAMP(ox, zone->x, zone->x + zone->w - w);
oy = E_CLAMP(oy, zone->y, zone->y + zone->h - h);
evas_object_move(ic->menu->comp_object, ox, oy);
}