From: <enl...@li...> - 2005-08-18 23:19:25
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_border.c Log Message: When switching focus from a window to the desktop, the "passive" signal was being sent to the border twice, causing borked edje transitions. (thanks pr0t0cod7) It looks like the section I commented out was unnecessary, and duplicated logic handled earlier in the function. (The original "else if ((!focus) && (bd->focused))" block). Can someone else verify this for me? =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.360 retrieving revision 1.361 diff -u -3 -r1.360 -r1.361 --- e_border.c 17 Aug 2005 06:28:08 -0000 1.360 +++ e_border.c 18 Aug 2005 05:03:15 -0000 1.361 @@ -940,11 +940,15 @@ } e_hints_active_window_set(bd->zone->container->manager, bd); } + +#if 0 + /* i'm pretty sure this case is handled above -- this was resulting in the "passive" + * event getting sent twice when going from a window to the desktop. --rephorm */ else if ((!bd->focused) && (focused == bd)) { if (focused) { -// printf("unfocus previous\n"); +// printf("unfocus previous 2\n"); edje_object_signal_emit(focused->bg_object, "passive", ""); e_focus_event_focus_out(focused); /* FIXME: Sometimes we should leave the window fullscreen! */ @@ -959,6 +963,7 @@ } e_hints_active_window_set(bd->zone->container->manager, NULL); } +#endif if (bd->focused) focused = bd; else if ((!bd->focused) && (focused == bd)) focused = NULL; } |