Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_scrollpane.c ewl_scrollpane.h
Log Message:
- The scrollpane shouldn't set it's preferred size to that of it's children.
Doing so will cause it to take large amounts of screen space at times.
This fixes the issue with the scrollpane being a lot bigger then text
required.
(Text was telling textblock its size was 1x1. Textblock would format with
that default and set a huge height. Text would resize, typically getting a
bigger width from the parent but keeping its height from textblock. Text
would tell textblock about the new size and textblock would reconfigure
itself in the new space but text would retain the huge height.)
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_scrollpane.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ewl_scrollpane.c 12 Nov 2007 22:42:22 -0000 1.27
+++ ewl_scrollpane.c 13 Nov 2007 06:03:16 -0000 1.28
@@ -55,14 +55,6 @@
ewl_widget_focusable_set(EWL_WIDGET(s), TRUE);
ewl_object_fill_policy_set(EWL_OBJECT(s), EWL_FLAG_FILL_ALL);
- ewl_container_show_notify_set(EWL_CONTAINER(s),
- ewl_scrollpane_cb_child_resize);
- ewl_container_resize_notify_set(EWL_CONTAINER(s),
- (Ewl_Child_Resize)
- ewl_scrollpane_cb_child_resize);
- ewl_container_hide_notify_set(EWL_CONTAINER(s),
- ewl_scrollpane_cb_child_resize);
-
ewl_container_callback_notify(EWL_CONTAINER(s), EWL_CALLBACK_FOCUS_IN);
ewl_container_callback_notify(EWL_CONTAINER(s), EWL_CALLBACK_FOCUS_OUT);
@@ -631,38 +623,6 @@
ewl_scrollpane_vscrollbar_value_set(s,
ewl_scrollpane_vscrollbar_value_get(s) +
ev->z * ewl_scrollpane_vscrollbar_step_get(s));
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @internal
- * @param parent: The container to work with
- * @param child: The widget to work with
- * @return Returns no value
- * @brief This handles all of the various size affecting callbacks.
- */
-void
-ewl_scrollpane_cb_child_resize(Ewl_Container *parent, Ewl_Widget *child)
-{
- int pw, ph;
- Ewl_Scrollpane *s;
-
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR(parent);
- DCHECK_PARAM_PTR(child);
- DCHECK_TYPE(parent, EWL_CONTAINER_TYPE);
- DCHECK_TYPE(child, EWL_WIDGET_TYPE);
-
- s = EWL_SCROLLPANE(parent);
-
- 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->hscrollbar)) +
- ewl_object_preferred_h_get(EWL_OBJECT(s->box));
-
- ewl_object_preferred_inner_w_set(EWL_OBJECT(parent), pw);
- ewl_object_preferred_inner_h_set(EWL_OBJECT(parent), ph);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_scrollpane.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ewl_scrollpane.h 11 Nov 2007 06:07:46 -0000 1.18
+++ ewl_scrollpane.h 13 Nov 2007 06:03:16 -0000 1.19
@@ -92,8 +92,6 @@
void ewl_scrollpane_cb_wheel_scroll(Ewl_Widget *w, void *ev_data,
void *user_data);
-void ewl_scrollpane_cb_child_resize(Ewl_Container *parent, Ewl_Widget *child);
-
/**
* @}
*/
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
