Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_canvas_test.c etk_tree_test.c
Log Message:
* Add the README file since it is not autogenerated (I don't know why)
* Add the ability to stop the propagation of an input event
* Fix the stacking bugs
* Rewrite the smart move code of the widget. It should be now more
adapted the future changes in Evas
* Fix the canvas
* Add the ability to clip a widget (even if it still needs some work)
* Some work on the colorpicker to optimize it and to fix it
It still seems to crash on the Amd64 systems, so if you meet crashes,
please send me a backtrace ( [EMAIL PROTECTED] :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_canvas_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_canvas_test.c 23 Oct 2005 08:05:34 -0000 1.3
+++ etk_canvas_test.c 29 Oct 2005 19:57:20 -0000 1.4
@@ -72,8 +72,4 @@
b = rand() % 255;
a = ETK_MAX(rand() % 255, 40);
evas_object_color_set(object, r, g, b, a);
-
- //printf("%d %d %d %d / %d %d %d %d\n", x, y, w, h, r, g, b, a);
-
- evas_object_raise(object);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_tree_test.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etk_tree_test.c 23 Oct 2005 23:27:50 -0000 1.9
+++ etk_tree_test.c 29 Oct 2005 19:57:20 -0000 1.10
@@ -30,7 +30,8 @@
Etk_Widget *tree;
Etk_Tree_Row *row;
Etk_Tree_Col *col1, *col2, *col3;
- Etk_Widget *table;
+ Etk_Widget *hpaned;
+ Etk_Widget *vbox;
Etk_Widget *label;
int i;
@@ -44,19 +45,20 @@
etk_window_title_set(ETK_WINDOW(win), _("Etk Tree Test"));
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_tree_window_deleted_cb), win);
- table = etk_table_new(2, 2, FALSE);
- etk_container_add(ETK_CONTAINER(win), table);
+ hpaned = etk_hpaned_new();
+ etk_container_add(ETK_CONTAINER(win), hpaned);
- label = etk_label_new(_("<h1>Tree:</h1>"));
- etk_table_attach(ETK_TABLE(table), label, 0, 0, 0, 0, 0, 0,
ETK_FILL_POLICY_HFILL);
+ /* The tree: */
+ vbox = etk_vbox_new(FALSE, 0);
+ etk_paned_add1(ETK_PANED(hpaned), vbox);
- label = etk_label_new(_("<h1>List:</h1>"));
- etk_table_attach(ETK_TABLE(table), label, 1, 1, 0, 0, 0, 0,
ETK_FILL_POLICY_HFILL);
+ label = etk_label_new(_("<h1>Tree:</h1>"));
+ etk_box_pack_start(ETK_BOX(vbox), label, FALSE, TRUE, 0);
- /* The tree: */
tree = etk_tree_new();
etk_widget_size_request_set(tree, 320, 400);
- etk_table_attach_defaults(ETK_TABLE(table), tree, 0, 0, 1, 1);
+ //etk_container_add(ETK_CONTAINER(win), tree);
+ etk_box_pack_start(ETK_BOX(vbox), tree, TRUE, TRUE, 0);
etk_tree_mode_set(ETK_TREE(tree), ETK_TREE_MODE_TREE);
col1 = etk_tree_col_new(ETK_TREE(tree), _("Column 1"),
ETK_TREE_COL_ICON_TEXT, 100);
@@ -80,13 +82,18 @@
etk_signal_connect("row_unselected", ETK_OBJECT(tree),
ETK_CALLBACK(_etk_test_tree_row_unselected), NULL);
/* The list: */
+ vbox = etk_vbox_new(FALSE, 0);
+ etk_paned_add2(ETK_PANED(hpaned), vbox);
+
+ label = etk_label_new(_("<h1>List:</h1>"));
+ etk_box_pack_start(ETK_BOX(vbox), label, FALSE, TRUE, 0);
+
tree = etk_tree_new();
etk_widget_size_request_set(tree, 320, 400);
- etk_table_attach_defaults(ETK_TABLE(table), tree, 1, 1, 1, 1);
+ etk_box_pack_start(ETK_BOX(vbox), tree, TRUE, TRUE, 0);
etk_tree_multiple_select_set(ETK_TREE(tree), TRUE);
col1 = etk_tree_col_new(ETK_TREE(tree), _("Column 1"),
ETK_TREE_COL_ICON_TEXT, 100);
- printf("Col 1: %p\n", col1);
col2 = etk_tree_col_new(ETK_TREE(tree), _("Column 2"), ETK_TREE_COL_INT,
100);
col3 = etk_tree_col_new(ETK_TREE(tree), _("Column 3"), ETK_TREE_COL_IMAGE,
100);
etk_tree_build(ETK_TREE(tree));
-------------------------------------------------------
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
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
