Enlightenment CVS committal Author : codewarrior Project : e17 Module : libs/etk
Dir : e17/libs/etk/src/bin Modified Files: etk_canvas_test.c etk_scrolled_view_test.c Log Message: [Etk_Fixed] Remove, overlap with Etk_Canvas [Etk_Canvas] Now uses was used to be Etk_Fixed, to add Evas_Object's to it, use the Etk_Evas_Object widget. [Tests] Reflect changes in test app. =================================================================== RCS file: /cvs/e/e17/libs/etk/src/bin/etk_canvas_test.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- etk_canvas_test.c 11 Apr 2008 03:25:19 -0000 1.16 +++ etk_canvas_test.c 19 Apr 2008 18:23:34 -0000 1.17 @@ -17,7 +17,7 @@ static int _etk_test_canvas_update2(void *data); /* Creates the vbox for the progress bars */ -static void etk_test_canvas_progress_bars_create(int x, int y) +static void _etk_test_canvas_progress_bars_create(int x, int y) { Etk_Widget *vbox; Etk_Widget *pbar; @@ -38,8 +38,7 @@ etk_signal_connect_swapped_by_code(ETK_OBJECT_DESTROYED_SIGNAL, ETK_OBJECT(pbar), ETK_CALLBACK(ecore_timer_del), _etk_test_canvas_timer); etk_signal_connect_swapped_by_code(ETK_OBJECT_DESTROYED_SIGNAL, ETK_OBJECT(pbar2), ETK_CALLBACK(ecore_timer_del), _etk_test_canvas_timer2); - etk_canvas_widget_add(ETK_CANVAS(canvas), vbox); - etk_canvas_widget_move(ETK_CANVAS(canvas), vbox, x, y); + etk_canvas_put(ETK_CANVAS(canvas), vbox, x, y); } /* Updates the first progress bar */ @@ -108,7 +107,7 @@ /* add some progess bars to the canvas */ for (i = 0; i < 3; i++) { - etk_test_canvas_progress_bars_create(50 + 50 * i, 50 + 50 * i); + _etk_test_canvas_progress_bars_create(50 + 50 * i, 50 + 50 * i); } etk_widget_show_all(win); @@ -117,9 +116,10 @@ /* Adds a rectangle object to the canvas */ static void _etk_test_canvas_object_add(void *data) { - Etk_Canvas *canvas; + Etk_Fixed *canvas; Evas *evas; Evas_Object *object; + Etk_Widget *etk_evas_object; int x, y; int cw, ch; @@ -137,9 +137,7 @@ int r, g, b, a; object = evas_object_rectangle_add(evas); - etk_canvas_object_add(canvas, object); - - w = ETK_MAX(abs(rand() % (cw - x)), 10); + w = ETK_MAX(abs(rand() % (cw - x)), 10); h = ETK_MAX(abs(rand() % (ch - y)), 10); evas_object_resize(object, w, h); @@ -150,18 +148,20 @@ evas_color_argb_premul(a, &r, &g, &b); evas_object_color_set(object, r, g, b, a); + etk_evas_object = etk_evas_object_new(); + etk_evas_object_set_object(ETK_EVAS_OBJECT(etk_evas_object), object); } /* Or add an image */ else { object = evas_object_image_add(evas); - etk_canvas_object_add(canvas, object); - evas_object_image_file_set(object, PACKAGE_DATA_DIR "/images/test.png", NULL); evas_object_image_fill_set(object, 0, 0, 48, 48); evas_object_resize(object, 48, 48); + etk_evas_object = etk_evas_object_new(); + etk_evas_object_set_object(ETK_EVAS_OBJECT(etk_evas_object), object); } - etk_canvas_object_move(canvas, object, x, y); - evas_object_show(object); + etk_canvas_put(canvas, etk_evas_object, x, y); + etk_widget_show_all(etk_evas_object); } =================================================================== RCS file: /cvs/e/e17/libs/etk/src/bin/etk_scrolled_view_test.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- etk_scrolled_view_test.c 28 Sep 2007 19:52:48 -0000 1.8 +++ etk_scrolled_view_test.c 19 Apr 2008 18:23:34 -0000 1.9 @@ -11,7 +11,7 @@ { static Etk_Widget *win = NULL; Etk_Widget *scrolled_view; - Etk_Widget *fixed; + Etk_Widget *canvas; Etk_Widget *button; int i, j; @@ -29,8 +29,8 @@ scrolled_view = etk_scrolled_view_new(); etk_container_add(ETK_CONTAINER(win), scrolled_view); - fixed = etk_fixed_new(); - etk_scrolled_view_add_with_viewport(ETK_SCROLLED_VIEW(scrolled_view), fixed); + canvas = etk_canvas_new(); + etk_scrolled_view_add_with_viewport(ETK_SCROLLED_VIEW(scrolled_view), canvas); for (i = 0; i < NUM_COLS; i++) { @@ -38,7 +38,7 @@ { button = etk_button_new_with_label("Scrolled View Test"); etk_widget_size_request_set(button, BUTTON_WIDTH, BUTTON_HEIGHT); - etk_fixed_put(ETK_FIXED(fixed), button, (BUTTON_WIDTH + SPACING) * i, (BUTTON_HEIGHT + SPACING) * j); + etk_canvas_put(ETK_CANVAS(canvas), button, (BUTTON_WIDTH + SPACING) * i, (BUTTON_HEIGHT + SPACING) * j); } } ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs