Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_fileselector.c ewl_scrollpane.c
Log Message:
Silly typo causing all kinds of problems for people with the scrollpane.
Set a reasonable min size on the fileselector.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_fileselector.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- ewl_fileselector.c 10 Oct 2005 15:27:10 -0000 1.26
+++ ewl_fileselector.c 14 Oct 2005 05:47:38 -0000 1.27
@@ -3,6 +3,9 @@
#include "ewl_macros.h"
#include "ewl_private.h"
+#define EWL_FS_TREE_WIDTH 500
+#define EWL_FS_TREE_HEIGHT 300
+
/*
* Internally used functions
*/
@@ -83,10 +86,11 @@
ewl_box_orientation_set(EWL_BOX(w), EWL_ORIENTATION_VERTICAL);
ewl_widget_appearance_set(w, "fileselector");
ewl_widget_inherit(w, "fileselector");
- ewl_object_size_request(EWL_OBJECT(w), 500, 450);
ewl_object_fill_policy_set(EWL_OBJECT(w),
EWL_FLAG_FILL_SHRINK |
EWL_FLAG_FILL_FILL);
+ ewl_object_minimum_size_set(EWL_OBJECT(w), EWL_FS_TREE_WIDTH,
+ EWL_FS_TREE_HEIGHT);
ewl_callback_append(w, EWL_CALLBACK_SHOW,
ewl_fileselector_show_cb, NULL);
ewl_callback_append(w, EWL_CALLBACK_DESTROY,
@@ -329,7 +333,7 @@
l = strlen(s1) + strlen(s2) + 1;
- s = (char *) malloc(sizeof(char) * l);
+ s = NEW(char, l);
s = memcpy(s, s1, strlen(s1));
memcpy(s + strlen(s1), s2, strlen(s2));
s[l - 1] = '\0';
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_scrollpane.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_scrollpane.c 3 Oct 2005 06:43:07 -0000 1.6
+++ ewl_scrollpane.c 14 Oct 2005 05:47:38 -0000 1.7
@@ -52,6 +52,8 @@
ewl_container_resize_notify_set(EWL_CONTAINER(s),
(Ewl_Child_Resize)
ewl_scrollpane_child_resize_cb);
+ ewl_container_hide_notify_set(EWL_CONTAINER(s),
+ ewl_scrollpane_child_resize_cb);
ewl_object_fill_policy_set(EWL_OBJECT(s), EWL_FLAG_FILL_ALL);
s->hflag = EWL_SCROLLPANE_FLAG_AUTO_VISIBLE;
s->vflag = EWL_SCROLLPANE_FLAG_AUTO_VISIBLE;
@@ -487,9 +489,9 @@
s = EWL_SCROLLPANE(parent);
- pw = ewl_object_preferred_w_get(EWL_OBJECT(s->hscrollbar)) +
+ pw = ewl_object_preferred_w_get(EWL_OBJECT(s->vscrollbar)) +
ewl_object_preferred_w_get(EWL_OBJECT(s->box));
- ph = ewl_object_preferred_h_get(EWL_OBJECT(s->vscrollbar)) +
+ ph = ewl_object_preferred_h_get(EWL_OBJECT(s->hscrollbar)) +
ewl_object_preferred_h_get(EWL_OBJECT(s->box));
ewl_object_preferred_inner_w_set(EWL_OBJECT(parent), pw);
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
