From: <enl...@li...> - 2005-06-13 13:11:06
|
Enlightenment CVS committal Author : handyande Project : misc Module : engage Dir : misc/engage/src/module Modified Files: .cvsignore e_mod_main.c tray.c Log Message: Fixup some layout issues, and finally got system tray icons to move - just to work onthe layout / align now =================================================================== RCS file: /cvsroot/enlightenment/misc/engage/src/module/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 27 Feb 2005 20:56:38 -0000 1.1 +++ .cvsignore 13 Jun 2005 13:10:53 -0000 1.2 @@ -2,6 +2,6 @@ .libs Makefile Makefile.in -e_mod_main.lo +*.lo module.la =================================================================== RCS file: /cvsroot/enlightenment/misc/engage/src/module/e_mod_main.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -3 -r1.54 -r1.55 --- e_mod_main.c 12 Jun 2005 12:16:23 -0000 1.54 +++ e_mod_main.c 13 Jun 2005 13:10:53 -0000 1.55 @@ -62,7 +62,7 @@ static void _engage_bar_menu_new(Engage_Bar *eb); static void _engage_bar_enable(Engage_Bar *eb); static void _engage_bar_disable(Engage_Bar *eb); -static void _engage_bar_frame_resize(Engage_Bar *eb); +void _engage_bar_frame_resize(Engage_Bar *eb); static void _engage_bar_edge_change(Engage_Bar *eb, int edge); static void _engage_bar_update_policy(Engage_Bar *eb); static void _engage_bar_motion_handle(Engage_Bar *eb, Evas_Coord mx, Evas_Coord my); @@ -1328,7 +1328,7 @@ e_box_thaw(ic->eb->box_object); } -static void +void _engage_bar_frame_resize(Engage_Bar *eb) { Evas_Coord x, y, w, h; =================================================================== RCS file: /cvsroot/enlightenment/misc/engage/src/module/tray.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- tray.c 12 Jun 2005 16:11:56 -0000 1.4 +++ tray.c 13 Jun 2005 13:10:53 -0000 1.5 @@ -18,7 +18,7 @@ static void _engage_tray_cb_resize(void *data, Evas_Object *o, Evas_Coord w, Evas_Coord h); static void _engage_tray_layout(Engage_Bar *eb); - +extern void _engage_bar_frame_resize(Engage_Bar *eb); void _engage_tray_init(Engage_Bar *eb) @@ -87,12 +87,13 @@ eb->tray->wins = evas_list_append(eb->tray->wins, (void *)win); eb->tray->icons++; ecore_x_window_resize(win, 24, 24); + ecore_x_window_reparent(win, eb->tray->win, 0, 0); + _engage_tray_layout(eb); + _engage_bar_frame_resize(eb); ecore_x_window_show(win); - _engage_tray_layout(eb); - } static void @@ -106,6 +107,7 @@ eb->tray->wins = evas_list_remove(eb->tray->wins, (void *)win); eb->tray->icons--; _engage_tray_layout(eb); + _engage_bar_frame_resize(eb); } static int |