Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto.c ephoto_browsing.c
Log Message:
This makes scrollpane function correctly upon switching which image you are
viewing.
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ephoto.c 1 Apr 2006 05:17:27 -0000 1.27
+++ ephoto.c 4 Apr 2006 00:04:27 -0000 1.28
@@ -340,7 +340,8 @@
ewl_border_text_set(EWL_BORDER(m->images), "Add Content");
ewl_border_label_alignment_set(EWL_BORDER(m->images),
EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(m->vbox), m->images);
- ewl_object_alignment_set(EWL_OBJECT(m->images),
EWL_FLAG_ALIGN_CENTER);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->images), 200, 999999);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->images),
EWL_FLAG_FILL_ALL);
ewl_widget_show(m->images);
m->directory = ewl_entry_new();
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_browsing.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ephoto_browsing.c 31 Mar 2006 22:16:29 -0000 1.15
+++ ephoto_browsing.c 4 Apr 2006 00:04:28 -0000 1.16
@@ -79,9 +79,9 @@
m->imagetree = ewl_tree_new(1);
ewl_container_child_append(EWL_CONTAINER(m->images),
m->imagetree);
- ewl_object_maximum_size_set(EWL_OBJECT(m->imagetree), 200, 215);
ewl_tree_headers_visible_set(EWL_TREE(m->imagetree), 0);
ewl_tree_expandable_rows_set(EWL_TREE(m->imagetree), FALSE);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->imagetree), 200, 215);
ewl_widget_show(m->imagetree);
/******************************************/
@@ -345,6 +345,32 @@
}
if ( page == m->viewbox && w != m->vbutton ) {
+ ewl_widget_destroy(m->viewscroll);
+ ewl_widget_destroy(m->vimage);
+ ewl_widget_destroy(m->vbutton);
+
+ m->viewscroll = ewl_scrollpane_new();
+ ewl_container_child_append(EWL_CONTAINER(m->viewbox),
m->viewscroll);
+ ewl_object_alignment_set(EWL_OBJECT(m->viewscroll),
EWL_FLAG_ALIGN_CENTER);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->viewscroll),
EWL_FLAG_FILL_ALL);
+ ewl_widget_show(m->viewscroll);
+
+ m->vimage = ewl_image_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(m->vimage),
EWL_FLAG_FILL_SHRINK);
+ ewl_container_child_append(EWL_CONTAINER(m->viewscroll),
m->vimage);
+ ewl_widget_show(m->vimage);
+
+ m->vbutton = ewl_button_new();
+ ewl_button_label_set(EWL_BUTTON(m->vbutton), "Add image to
slideshow");
+ ewl_container_child_append(EWL_CONTAINER(m->viewbox),
m->vbutton);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->vbutton), 150 , 25);
+ ewl_object_alignment_set(EWL_OBJECT(m->vbutton),
EWL_FLAG_ALIGN_CENTER);
+ ewl_callback_append(m->vbutton, EWL_CALLBACK_CLICKED,
images_cb, NULL);
+ ewl_widget_disable(m->vbutton);
+ ewl_widget_state_set(m->vbutton, "disabled");
+ ewl_widget_show(m->vbutton);
+
+
ewl_image_file_set(EWL_IMAGE(m->vimage), pathi, NULL);
ewl_widget_enable(m->vbutton);
ewl_widget_state_set(m->vbutton, "enabled");
-------------------------------------------------------
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
