Enlightenment CVS committal Author : moom16 Project : e17 Module : proto
Dir : e17/proto/etk/src/lib Modified Files: etk_object.c etk_object.h etk_signal.c etk_vbox.c etk_widget.c Log Message: * Reverts etk_object_lookup changes and reverts the vbox fix. Better fixes will be committed soon. =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_object.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- etk_object.c 4 Mar 2006 18:04:10 -0000 1.17 +++ etk_object.c 4 Mar 2006 19:48:20 -0000 1.18 @@ -29,10 +29,8 @@ static void _etk_object_destructor(Etk_Object *object); static Evas_Bool _etk_object_notification_callbacks_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata); static Evas_Bool _etk_object_data_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata); -static Evas_Bool _etk_object_hash_foreach(Evas_Hash *hash, const char *key, void *data, void *fdata); static Evas_List *_etk_object_created_objects = NULL; -static Evas_Hash *_etk_object_created_objects_hash = NULL; static Etk_Signal *_etk_object_signals[ETK_OBJECT_NUM_SIGNALS]; /************************** @@ -99,7 +97,6 @@ new_object = malloc(object_type->type_size); new_object->type = object_type; _etk_object_created_objects = evas_list_append(_etk_object_created_objects, new_object); - _etk_object_created_objects_hash = evas_hash_add(_etk_object_created_objects_hash, new_object, new_object); etk_type_object_construct(object_type, new_object); va_copy(args2, args); @@ -121,7 +118,6 @@ etk_signal_emit(_etk_object_signals[ETK_OBJECT_DESTROYED_SIGNAL], object, NULL); etk_type_destructors_call(object->type, object); _etk_object_created_objects = evas_list_remove(_etk_object_created_objects, object); - _etk_object_created_objects_hash = evas_hash_del(_etk_object_created_objects_hash, object, object); free(object); } @@ -131,16 +127,7 @@ void etk_object_destroy_all_objects() { while (_etk_object_created_objects) - etk_object_destroy(ETK_OBJECT(_etk_object_created_objects->data)); -} - -/* - * @brief Looks up an object so we know if it exists - * @param object the object we want to find - */ -void *etk_object_lookup(Etk_Object *object) -{ - return evas_hash_find(_etk_object_created_objects_hash, object); + etk_object_destroy(ETK_OBJECT(_etk_object_created_objects->data)); } /** =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_object.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- etk_object.h 3 Mar 2006 10:04:27 -0000 1.5 +++ etk_object.h 4 Mar 2006 19:48:20 -0000 1.6 @@ -56,7 +56,6 @@ Etk_Object *etk_object_new_valist(Etk_Type *object_type, const char *first_property, va_list args); void etk_object_destroy(Etk_Object *object); void etk_object_destroy_all_objects(); -void *etk_object_lookup(Etk_Object *object); Etk_Object *etk_object_check_cast(Etk_Object *object, Etk_Type *type); Etk_Type *etk_object_object_type_get(Etk_Object *object); =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_signal.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- etk_signal.c 4 Mar 2006 18:04:10 -0000 1.9 +++ etk_signal.c 4 Mar 2006 19:48:20 -0000 1.10 @@ -301,7 +301,8 @@ * @param object the object which emits the signal (it will be passed as the first argument to the callback function) * @param return_value the location where we will put the return value (may be NULL) * @param args the arguments to pass to the callback function - */ + */ +/* TODO: Fixme the right way! */ void etk_signal_emit_valist(Etk_Signal *signal, Etk_Object *object, void *return_value, va_list args) { Evas_List *callbacks; @@ -335,7 +336,7 @@ callbacks = evas_list_remove_list(callbacks, callbacks); } - if (_etk_signal_stop_emission || !etk_object_lookup(object)) + if (_etk_signal_stop_emission) return; /* Calls the default handler */ =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_vbox.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- etk_vbox.c 28 Feb 2006 00:44:14 -0000 1.7 +++ etk_vbox.c 4 Mar 2006 19:48:20 -0000 1.8 @@ -5,7 +5,7 @@ /** * @addtogroup Etk_VBox -* @{ + * @{ */ static void _etk_vbox_constructor(Etk_VBox *vbox); @@ -138,11 +138,10 @@ int num_children_to_expand = 0, i; float start_offset = 0, end_offset = 0; - if ((!(vbox = ETK_VBOX(widget))) || !vbox->requested_sizes) + /* Fixme: correctly and fix hbox too */ + if ((!(vbox = ETK_VBOX(widget)))) return; - - box = ETK_BOX(vbox); widget = ETK_WIDGET(vbox); container = ETK_CONTAINER(vbox); =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_widget.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -3 -r1.45 -r1.46 --- etk_widget.c 4 Mar 2006 18:04:12 -0000 1.45 +++ etk_widget.c 4 Mar 2006 19:48:20 -0000 1.46 @@ -517,11 +517,10 @@ if (!widget) return; + if (!widget->visibility_locked) + etk_widget_show(widget); for (l = widget->children; l; l = l->next) etk_widget_show_all(ETK_WIDGET(l->data)); - - if (!widget->visibility_locked) - etk_widget_show(widget); } /** @@ -1938,7 +1937,7 @@ etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_IN_SIGNAL], ETK_OBJECT(widget), NULL, &event); - if (_etk_widget_propagate_event && widget->parent && etk_object_lookup(ETK_OBJECT(widget))) + if (_etk_widget_propagate_event && widget->parent) _etk_widget_mouse_in_cb(widget->parent, evas, NULL, event_info); } @@ -1974,7 +1973,7 @@ etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_OUT_SIGNAL], ETK_OBJECT(widget), NULL, &event); - if (_etk_widget_propagate_event && widget->parent && etk_object_lookup(ETK_OBJECT(widget))) + if (_etk_widget_propagate_event && widget->parent) _etk_widget_mouse_out_cb(widget->parent, evas, NULL, event_info); } @@ -2014,7 +2013,7 @@ etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_MOVE_SIGNAL], ETK_OBJECT(widget), NULL, &event); - if (_etk_widget_propagate_event && widget->parent && etk_object_lookup(ETK_OBJECT(widget))) + if (_etk_widget_propagate_event && widget->parent) _etk_widget_mouse_move_cb(widget->parent, evas, NULL, event_info); } @@ -2043,7 +2042,7 @@ etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_DOWN_SIGNAL], ETK_OBJECT(widget), NULL, &event); - if (_etk_widget_propagate_event && widget->repeat_events && widget->parent && etk_object_lookup(ETK_OBJECT(widget))) + if (_etk_widget_propagate_event && widget->repeat_events && widget->parent) _etk_widget_mouse_down_cb(widget->parent, evas, NULL, event_info); } @@ -2081,9 +2080,6 @@ event.timestamp = evas_event->timestamp; etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_UP_SIGNAL], ETK_OBJECT(widget), NULL, &event); - - if(!etk_object_lookup(ETK_OBJECT(widget))) - return; if (evas_event->canvas.x >= widget->geometry.x && evas_event->canvas.x <= widget->geometry.x + widget->geometry.w && evas_event->canvas.y >= widget->geometry.y && evas_event->canvas.y <= widget->geometry.y + widget->geometry.h) @@ -2118,7 +2114,7 @@ etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_WHEEL_SIGNAL], ETK_OBJECT(widget), NULL, &event); - if (_etk_widget_propagate_event && widget->parent && etk_object_lookup(ETK_OBJECT(widget))) + if (_etk_widget_propagate_event && widget->parent) _etk_widget_mouse_wheel_cb(widget->parent, evas, NULL, event_info); } @@ -2145,7 +2141,7 @@ etk_signal_emit(_etk_widget_signals[ETK_WIDGET_KEY_DOWN_SIGNAL], ETK_OBJECT(widget), NULL, &event); - if (_etk_widget_propagate_event && widget->parent && etk_object_lookup(ETK_OBJECT(widget))) + if (_etk_widget_propagate_event && widget->parent) _etk_widget_key_down_cb(widget->parent, evas, NULL, event_info); } @@ -2198,7 +2194,7 @@ etk_signal_emit(_etk_widget_signals[ETK_WIDGET_KEY_UP_SIGNAL], ETK_OBJECT(widget), NULL, &event); - if (_etk_widget_propagate_event && widget->parent && etk_object_lookup(ETK_OBJECT(widget))) + if (_etk_widget_propagate_event && widget->parent) _etk_widget_key_up_cb(widget->parent, evas, NULL, event_info); } ------------------------------------------------------- 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