Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_main.c
Log Message:
the boxy ibar was annoying me... and i found ibar didnt properly calculate
size based on iconsize. fixed now :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_main.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_mod_main.c 11 Mar 2005 09:32:21 -0000 1.16
+++ e_mod_main.c 12 Mar 2005 09:44:16 -0000 1.17
@@ -882,7 +882,7 @@
static void
_ibar_bar_frame_resize(IBar_Bar *ibb)
{
- Evas_Coord w, h;
+ Evas_Coord w, h, bw, bh;
/* Not finished loading config yet! */
if ((ibb->x == -1)
|| (ibb->y == -1)
@@ -894,10 +894,14 @@
e_box_freeze(ibb->box_object);
e_box_min_size_get(ibb->box_object, &w, &h);
+ edje_extern_object_min_size_set(ibb->box_object, w, h);
+ edje_object_part_swallow(ibb->bar_object, "items", ibb->box_object);
+ edje_object_size_min_calc(ibb->bar_object, &bw, &bh);
+ /* _calc */
if (ibb->ibar->conf->width == IBAR_WIDTH_AUTO)
{
- e_gadman_client_resize(ibb->gmc, w, h);
+ e_gadman_client_resize(ibb->gmc, bw, bh);
}
else
{
@@ -905,13 +909,13 @@
|| (e_gadman_client_edge_get(ibb->gmc) == E_GADMAN_EDGE_RIGHT))
{
/* h is the width of the bar */
- e_gadman_client_resize(ibb->gmc, w, ibb->h);
+ e_gadman_client_resize(ibb->gmc, bw, ibb->h);
}
else if ((e_gadman_client_edge_get(ibb->gmc) == E_GADMAN_EDGE_TOP)
|| (e_gadman_client_edge_get(ibb->gmc) ==
E_GADMAN_EDGE_BOTTOM))
{
/* w is the width of the bar */
- e_gadman_client_resize(ibb->gmc, ibb->w, h);
+ e_gadman_client_resize(ibb->gmc, ibb->w, bh);
}
}
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
