Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_main.c
Log Message:
Update.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_mod_main.c 17 Feb 2005 17:45:20 -0000 1.12
+++ e_mod_main.c 21 Feb 2005 16:12:32 -0000 1.13
@@ -6,7 +6,7 @@
/* TODO List:
*
- * * Create seperate config for each bar
+ * * Create separate config for each bar
* * Fix menu
* * How should the bar resize? Allow fixed width, or just autoresize.
*
@@ -77,8 +77,6 @@
static void _ibar_bar_cb_width_auto(void *data, E_Menu *m, E_Menu_Item *mi);
#if 0
static void _ibar_icon_reorder_before(IBar_Icon *ic, IBar_Icon *before);
-static void _ibar_bar_cb_width_fixed(void *data, E_Menu *m, E_Menu_Item
*mi);
-static void _ibar_bar_cb_width_fill(void *data, E_Menu *m, E_Menu_Item *mi);
#endif
static void _ibar_bar_iconsize_change(IBar_Bar *ibb);
static void _ibar_bar_cb_iconsize_microscopic(void *data, E_Menu *m,
E_Menu_Item *mi);
@@ -325,7 +323,6 @@
Evas_List *l, *ll;
ib = data;
-
for (l = ib->bars; l; l = l->next)
{
IBar_Bar *ibb;
@@ -334,7 +331,7 @@
switch (ch)
{
case E_APP_ADD:
- if (a->parent == ib->apps)
+ if (e_app_is_parent(ib->apps, a))
{
IBar_Icon *ic;
@@ -356,7 +353,7 @@
}
break;
case E_APP_DEL:
- if (a->parent == ib->apps)
+ if (e_app_is_parent(ib->apps, a))
{
IBar_Icon *ic;
@@ -366,7 +363,7 @@
}
break;
case E_APP_CHANGE:
- if (a->parent == ib->apps)
+ if (e_app_is_parent(ib->apps, a))
{
IBar_Icon *ic;
@@ -509,6 +506,10 @@
evas_event_thaw(ibb->evas);
+ /* We need to resize, if the width is auto and the number
+ * of apps has changed since last startup */
+ _ibar_bar_frame_resize(ibb);
+
/*
edje_object_signal_emit(ibb->bar_object, "passive", "");
edje_object_signal_emit(ibb->overlay_object, "passive", "");
@@ -893,9 +894,6 @@
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, &w, &h);
if (ibb->ibar->conf->width == IBAR_WIDTH_AUTO)
{
-------------------------------------------------------
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
