Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin
Modified Files:
ewl_paned_test.c ewl_theme_test.c
Log Message:
- rework the paned widget
- get rid of the active_area stuff, not needed anymore
- just append your widgets with the normal container functions and the
grabbers will be automaticalloy added. Can hold as many panes as needed
per paned widget
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_paned_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_paned_test.c 18 Dec 2005 05:18:38 -0000 1.5
+++ ewl_paned_test.c 28 Dec 2005 22:25:46 -0000 1.6
@@ -3,6 +3,15 @@
static Ewl_Widget *paned_button;
static void
+ewl_paned_test_cb_clicked(Ewl_Widget *w, void *ev __UNUSED__,
+ void *data)
+{
+ printf("Clicked %s\n", (char *)data);
+
+ ewl_widget_hide(w);
+}
+
+static void
__destroy_paned_test_window(Ewl_Widget * w, void *ev_data __UNUSED__,
void *user_data __UNUSED__)
{
@@ -23,6 +32,7 @@
ewl_window_title_set(EWL_WINDOW(paned_win), "Paned Test");
ewl_window_name_set(EWL_WINDOW(paned_win), "EWL Test Application");
ewl_window_class_set(EWL_WINDOW(paned_win), "EFL Test Application");
+ ewl_object_size_request(EWL_OBJECT(paned_win), 400, 600);
if (w) {
ewl_callback_del(w, EWL_CALLBACK_CLICKED,
@@ -45,31 +55,75 @@
ewl_container_child_append(EWL_CONTAINER(box), pane1);
ewl_widget_show(pane1);
- ewl_paned_active_area_set(EWL_PANED(pane1), EWL_POSITION_TOP);
-
pane2 = ewl_hpaned_new();
ewl_container_child_append(EWL_CONTAINER(pane1), pane2);
ewl_widget_show(pane2);
- ewl_paned_active_area_set(EWL_PANED(pane2), EWL_POSITION_LEFT);
+ o = ewl_button_new();
+ ewl_button_label_set(EWL_BUTTON(o), "Fill");
+ ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_FILL);
+ ewl_container_child_append(EWL_CONTAINER(pane2), o);
+ ewl_callback_append(o, EWL_CALLBACK_CLICKED,
+ ewl_paned_test_cb_clicked, "Fill");
+ ewl_widget_show(o);
o = ewl_button_new();
- ewl_button_label_set(EWL_BUTTON(o), "left");
+ ewl_button_label_set(EWL_BUTTON(o), "HFill | VShrink");
+ ewl_object_fill_policy_set(EWL_OBJECT(o),
+ EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_VSHRINK);
ewl_container_child_append(EWL_CONTAINER(pane2), o);
+ ewl_callback_append(o, EWL_CALLBACK_CLICKED,
+ ewl_paned_test_cb_clicked, "HFill | VShrink");
ewl_widget_show(o);
- ewl_paned_active_area_set(EWL_PANED(pane2), EWL_POSITION_RIGHT);
+ o = ewl_button_new();
+ ewl_button_label_set(EWL_BUTTON(o), "HShrink | VFill");
+ ewl_object_fill_policy_set(EWL_OBJECT(o),
+ EWL_FLAG_FILL_HSHRINK | EWL_FLAG_FILL_VFILL);
+ ewl_container_child_append(EWL_CONTAINER(pane2), o);
+ ewl_callback_append(o, EWL_CALLBACK_CLICKED,
+ ewl_paned_test_cb_clicked, "HShrink | VFill");
+ ewl_widget_show(o);
o = ewl_button_new();
- ewl_button_label_set(EWL_BUTTON(o), "right");
+ ewl_button_label_set(EWL_BUTTON(o), "shrink");
+ ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_SHRINK);
ewl_container_child_append(EWL_CONTAINER(pane2), o);
+ ewl_callback_append(o, EWL_CALLBACK_CLICKED,
+ ewl_paned_test_cb_clicked, "Shrink");
ewl_widget_show(o);
- ewl_paned_active_area_set(EWL_PANED(pane1), EWL_POSITION_BOTTOM);
+ pane2 = ewl_hpaned_new();
+ ewl_container_child_append(EWL_CONTAINER(pane1), pane2);
+ ewl_widget_show(pane2);
+
+ o = ewl_button_new();
+ ewl_button_label_set(EWL_BUTTON(o), "Left Top");
+ ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_NONE);
+ ewl_object_alignment_set(EWL_OBJECT(o),
+ EWL_FLAG_ALIGN_LEFT | EWL_FLAG_ALIGN_TOP);
+ ewl_container_child_append(EWL_CONTAINER(pane2), o);
+ ewl_callback_append(o, EWL_CALLBACK_CLICKED,
+ ewl_paned_test_cb_clicked, "Left Top");
+ ewl_widget_show(o);
o = ewl_button_new();
- ewl_button_label_set(EWL_BUTTON(o), "bottom");
- ewl_container_child_append(EWL_CONTAINER(pane1), o);
+ ewl_button_label_set(EWL_BUTTON(o), "Center");
+ ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_NONE);
+ ewl_object_alignment_set(EWL_OBJECT(o), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(pane2), o);
+ ewl_callback_append(o, EWL_CALLBACK_CLICKED,
+ ewl_paned_test_cb_clicked, "Center");
+ ewl_widget_show(o);
+
+ o = ewl_button_new();
+ ewl_button_label_set(EWL_BUTTON(o), "Right Bottom");
+ ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_NONE);
+ ewl_object_alignment_set(EWL_OBJECT(o),
+ EWL_FLAG_ALIGN_RIGHT | EWL_FLAG_ALIGN_BOTTOM);
+ ewl_container_child_append(EWL_CONTAINER(pane2), o);
+ ewl_callback_append(o, EWL_CALLBACK_CLICKED,
+ ewl_paned_test_cb_clicked, "Right Bottom");
ewl_widget_show(o);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_theme_test.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_theme_test.c 21 Nov 2005 05:24:22 -0000 1.12
+++ ewl_theme_test.c 28 Dec 2005 22:25:46 -0000 1.13
@@ -291,15 +291,11 @@
ewl_container_child_append (EWL_CONTAINER (vbox), misc);
ewl_widget_show (misc);
- ewl_paned_active_area_set(EWL_PANED(misc), EWL_POSITION_LEFT);
-
item = ewl_text_new();
ewl_text_text_set(EWL_TEXT(item), "left");
ewl_container_child_append(EWL_CONTAINER(misc), item);
ewl_widget_show (item);
- ewl_paned_active_area_set(EWL_PANED(misc), EWL_POSITION_RIGHT);
-
item = ewl_text_new();
ewl_text_text_set(EWL_TEXT(item), "right");
ewl_container_child_append(EWL_CONTAINER(misc), item);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs