summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsebastid <sebastid>2005-02-21 16:12:32 +0000
committersebastid <sebastid@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2005-02-21 16:12:32 +0000
commit909227ac7cb8eae2d5288e69812481c63a5468d3 (patch)
tree391e5c5ecdedae6dfe9bf1315986888095346fca
parent013cf15a767a935fac9c7d3af24c71a3c32ebcc9 (diff)
Update.
SVN revision: 13455
-rw-r--r--src/modules/ibar/e_mod_main.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index 34e43c90f..317237f9d 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -6,7 +6,7 @@
6 6
7/* TODO List: 7/* TODO List:
8 * 8 *
9 * * Create seperate config for each bar 9 * * Create separate config for each bar
10 * * Fix menu 10 * * Fix menu
11 * * How should the bar resize? Allow fixed width, or just autoresize. 11 * * How should the bar resize? Allow fixed width, or just autoresize.
12 * 12 *
@@ -77,8 +77,6 @@ static void _ibar_icon_cb_mouse_up(void *data, Evas *e, Evas_Object *obj, voi
77static void _ibar_bar_cb_width_auto(void *data, E_Menu *m, E_Menu_Item *mi); 77static void _ibar_bar_cb_width_auto(void *data, E_Menu *m, E_Menu_Item *mi);
78#if 0 78#if 0
79static void _ibar_icon_reorder_before(IBar_Icon *ic, IBar_Icon *before); 79static void _ibar_icon_reorder_before(IBar_Icon *ic, IBar_Icon *before);
80static void _ibar_bar_cb_width_fixed(void *data, E_Menu *m, E_Menu_Item *mi);
81static void _ibar_bar_cb_width_fill(void *data, E_Menu *m, E_Menu_Item *mi);
82#endif 80#endif
83static void _ibar_bar_iconsize_change(IBar_Bar *ibb); 81static void _ibar_bar_iconsize_change(IBar_Bar *ibb);
84static void _ibar_bar_cb_iconsize_microscopic(void *data, E_Menu *m, E_Menu_Item *mi); 82static void _ibar_bar_cb_iconsize_microscopic(void *data, E_Menu *m, E_Menu_Item *mi);
@@ -325,7 +323,6 @@ _ibar_app_change(void *data, E_App *a, E_App_Change ch)
325 Evas_List *l, *ll; 323 Evas_List *l, *ll;
326 324
327 ib = data; 325 ib = data;
328
329 for (l = ib->bars; l; l = l->next) 326 for (l = ib->bars; l; l = l->next)
330 { 327 {
331 IBar_Bar *ibb; 328 IBar_Bar *ibb;
@@ -334,7 +331,7 @@ _ibar_app_change(void *data, E_App *a, E_App_Change ch)
334 switch (ch) 331 switch (ch)
335 { 332 {
336 case E_APP_ADD: 333 case E_APP_ADD:
337 if (a->parent == ib->apps) 334 if (e_app_is_parent(ib->apps, a))
338 { 335 {
339 IBar_Icon *ic; 336 IBar_Icon *ic;
340 337
@@ -356,7 +353,7 @@ _ibar_app_change(void *data, E_App *a, E_App_Change ch)
356 } 353 }
357 break; 354 break;
358 case E_APP_DEL: 355 case E_APP_DEL:
359 if (a->parent == ib->apps) 356 if (e_app_is_parent(ib->apps, a))
360 { 357 {
361 IBar_Icon *ic; 358 IBar_Icon *ic;
362 359
@@ -366,7 +363,7 @@ _ibar_app_change(void *data, E_App *a, E_App_Change ch)
366 } 363 }
367 break; 364 break;
368 case E_APP_CHANGE: 365 case E_APP_CHANGE:
369 if (a->parent == ib->apps) 366 if (e_app_is_parent(ib->apps, a))
370 { 367 {
371 IBar_Icon *ic; 368 IBar_Icon *ic;
372 369
@@ -509,6 +506,10 @@ _ibar_bar_new(IBar *ib, E_Container *con)
509 506
510 evas_event_thaw(ibb->evas); 507 evas_event_thaw(ibb->evas);
511 508
509 /* We need to resize, if the width is auto and the number
510 * of apps has changed since last startup */
511 _ibar_bar_frame_resize(ibb);
512
512 /* 513 /*
513 edje_object_signal_emit(ibb->bar_object, "passive", ""); 514 edje_object_signal_emit(ibb->bar_object, "passive", "");
514 edje_object_signal_emit(ibb->overlay_object, "passive", ""); 515 edje_object_signal_emit(ibb->overlay_object, "passive", "");
@@ -893,9 +894,6 @@ _ibar_bar_frame_resize(IBar_Bar *ibb)
893 e_box_freeze(ibb->box_object); 894 e_box_freeze(ibb->box_object);
894 895
895 e_box_min_size_get(ibb->box_object, &w, &h); 896 e_box_min_size_get(ibb->box_object, &w, &h);
896 edje_extern_object_min_size_set(ibb->box_object, w, h);
897 edje_object_part_swallow(ibb->bar_object, "items", ibb->box_object);
898 edje_object_size_min_calc(ibb->bar_object, &w, &h);
899 897
900 if (ibb->ibar->conf->width == IBAR_WIDTH_AUTO) 898 if (ibb->ibar->conf->width == IBAR_WIDTH_AUTO)
901 { 899 {