Enlightenment CVS committal Author : lordchaos Project : e17 Module : libs/ewl
Dir : e17/libs/ewl/src/lib Modified Files: ewl_iconbox.c Log Message: * The recent text changes seem to cause a lockup when calling ewl_widget_show() on a menu =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_iconbox.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -3 -r1.78 -r1.79 --- ewl_iconbox.c 21 Nov 2005 04:13:41 -0000 1.78 +++ ewl_iconbox.c 21 Nov 2005 23:25:15 -0000 1.79 @@ -180,6 +180,8 @@ /*Set the defaults to 0 for layout*/ ib->lx = ib->ly = ib->iw = ib->ih = 0; + + ib->ewl_iconbox_pane_inner = ewl_overlay_new(); ewl_container_child_append(EWL_CONTAINER(ib->ewl_iconbox_scrollpane), ib->ewl_iconbox_pane_inner); @@ -197,6 +199,8 @@ ewl_container_child_append(EWL_CONTAINER(ib->ewl_iconbox_menu_floater), ib->ewl_iconbox_context_menu); ewl_widget_show(ib->ewl_iconbox_context_menu); + + /* Add auto-arrange ability */ ib->ewl_iconbox_view_menu = ewl_menu_new(); ewl_menu_item_text_set(EWL_MENU_ITEM(ib->ewl_iconbox_view_menu), @@ -246,6 +250,7 @@ ewl_container_child_append(EWL_CONTAINER(ib->ewl_iconbox_pane_inner), ib->icon_menu_floater); + /*-----------------------------------*/ @@ -282,6 +287,7 @@ ewl_widget_show(ib->select); /*ewl_widget_show(ib->select_floater);*/ + /*Init the icon list*/ ib->ewl_iconbox_icon_list = ecore_list_new(); @@ -289,10 +295,6 @@ /* Show widgets */ ewl_widget_show(ib->ewl_iconbox_pane_inner); ewl_widget_show(ib->ewl_iconbox_scrollpane); - ewl_widget_show(ib->ewl_iconbox_menu_floater); - ewl_widget_show(ib->icon_menu_floater); - - /* Ewl Entry for the purposes of label editing - if enabled */ ib->entry = ewl_entry_new(); @@ -1045,11 +1047,8 @@ if (ev->button == 3 /* Confirm that this is not an icon event */ && (ib->xdown != ev->x && ib->ydown != ev->y)) { /*printf ("Context menu: %d,%d\n", ev->x, ev->y);*/ - ewl_floater_position_set(EWL_FLOATER(ib->ewl_iconbox_menu_floater), ev->x-ibx + abs(px-ibx), ev->y-iby +abs(py-iby)); - //ewl_widget_show(ib->ewl_iconbox_view_menu); - //ewl_widget_show(ib->ewl_iconbox_context_menu); - //ewl_menu_popup_move_cb(EWL_MENU(ib->ewl_iconbox_context_menu)->base.popup, NULL, ib->ewl_iconbox_context_menu); ewl_callback_call(EWL_WIDGET(ib->ewl_iconbox_context_menu), EWL_CALLBACK_SELECT); + ewl_floater_position_set(EWL_FLOATER(ib->ewl_iconbox_menu_floater), ev->x-ibx + abs(px-ibx), ev->y-iby +abs(py-iby)); } else if (ev->button == 1 /* Confirm that this is not an icon event */ && (ib->xdown != ev->x && ib->ydown != ev->y)) { ewl_object_custom_size_set(EWL_OBJECT(ib->select), 1, 1); ------------------------------------------------------- This SF.Net email is sponsored by the JBoss Inc. Get Certified Today Register for a JBoss Training Course. Free Certification Exam for All Training Attendees Through End of 2005. For more info visit: http://ads.osdn.com/?ad_id=7628&alloc_id=16845&op=click _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs