Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_menu.c
Log Message:
- fix the menu corruption when you open and close the same menu multiple
times.
- needed to actually call ewl_widget_configure instead of just calling
the CONFIGURE callback
- fix a couple warnings left over from the position moving to the embed
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_menu.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ewl_menu.c 12 Apr 2006 06:41:55 -0000 1.27
+++ ewl_menu.c 13 Apr 2006 17:04:19 -0000 1.28
@@ -125,7 +125,7 @@
menu = EWL_MENU(w);
emb = ewl_embed_widget_find(w);
- ewl_embed_window_position_get(EWL_WINDOW(emb), &x, &y);
+ ewl_embed_window_position_get(EWL_EMBED(emb), &x, &y);
menu->popup_x = x + CURRENT_X(w);
menu->popup_y = y + CURRENT_Y(w);
@@ -187,12 +187,11 @@
ewl_widget_show(menu->base.popup);
ewl_window_raise(EWL_WINDOW(menu->base.popup));
- ewl_callback_call(menu->base.popup, EWL_CALLBACK_CONFIGURE);
- ewl_callback_call(EWL_WIDGET(menu), EWL_CALLBACK_CONFIGURE);
+ ewl_widget_configure(menu->base.popup);
+ ewl_widget_configure(EWL_WIDGET(menu));
ewl_widget_focus_send(menu->base.popbox);
-
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -241,8 +240,8 @@
embed = ewl_embed_widget_find(EWL_WIDGET(menu)->parent);
menu_embed = ewl_embed_widget_find(EWL_WIDGET(menu->base.popup));
- ewl_embed_window_position_get(EWL_WINDOW(embed), &wx, &wy);
- ewl_embed_window_position_get(EWL_WINDOW(menu->base.popup), &x, &y);
+ ewl_embed_window_position_get(EWL_EMBED(embed), &wx, &wy);
+ ewl_embed_window_position_get(EWL_EMBED(menu->base.popup), &x, &y);
ewl_object_current_size_get(EWL_OBJECT(menu->base.popup), &width,
&height);
if (((ev->x + x) > x) && ((ev->y + y) > y)
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
