Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_scrollbar.c ewl_scrollbar.h ewl_scrollpane.c
ewl_textarea.c
Log Message:
Work towards getting the scrollpane back in working order, and clipping
textareas correctly. Some theme work left to do.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_scrollbar.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ewl_scrollbar.c 24 Jun 2003 20:19:31 -0000 1.21
+++ ewl_scrollbar.c 2 Sep 2003 21:57:13 -0000 1.22
@@ -9,11 +9,9 @@
/**
- * ewl_scrollbar_new - allocate and initialize a new scrollbar widget
- * @orientation: the desired orientation of the scrollbar
- *
- * Returns NULL on failure, or a pointer to the newly allocated scrollbar
- * widget on success.
+ * @param orientation: the desired orientation of the scrollbar
+ * @return Returns NULL on failure, or a pointer to a new scrollbar on success.
+ * @brief Allocate and initialize a new scrollbar widget
*/
Ewl_Widget *ewl_scrollbar_new(Ewl_Orientation orientation)
{
@@ -85,10 +83,22 @@
* Attach callbacks to the buttons and seeker to handle the various
* events.
*/
- ewl_callback_append(s->button_increment, EWL_CALLBACK_MOUSE_DOWN,
- __ewl_scrollbar_increment, s);
- ewl_callback_append(s->button_decrement, EWL_CALLBACK_MOUSE_DOWN,
- __ewl_scrollbar_decrement, s);
+ if (orientation == EWL_ORIENTATION_HORIZONTAL) {
+ ewl_callback_append(s->button_increment,
+ EWL_CALLBACK_MOUSE_DOWN,
+ __ewl_scrollbar_increment, s);
+ ewl_callback_append(s->button_decrement,
+ EWL_CALLBACK_MOUSE_DOWN,
+ __ewl_scrollbar_decrement, s);
+ }
+ else {
+ ewl_callback_append(s->button_increment,
+ EWL_CALLBACK_MOUSE_DOWN,
+ __ewl_scrollbar_decrement, s);
+ ewl_callback_append(s->button_decrement,
+ EWL_CALLBACK_MOUSE_DOWN,
+ __ewl_scrollbar_increment, s);
+ }
/*
* Set the default alignment for the buttons.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_scrollbar.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_scrollbar.h 24 Jun 2003 05:09:58 -0000 1.7
+++ ewl_scrollbar.h 2 Sep 2003 21:57:13 -0000 1.8
@@ -1,24 +1,53 @@
#ifndef __EWL_SCROLLBAR_H__
#define __EWL_SCROLLBAR_H__
-typedef struct _ewl_scrollbar Ewl_Scrollbar;
-
+/**
+ * @defgroup Ewl_Scrollbar A Simple Scrollbar Widget
+ * Defines an Ewl_Scrollbar for using when scrolling values are needed.
+ *
+ * @{
+ */
+
+/**
+ * Provides a seeker with increment and decrement buttons arranged in a
+ * specified order.
+ */
+typedef struct Ewl_Scrollbar Ewl_Scrollbar;
+
+/**
+ * @def EWL_SCROLLBAR(scrollbar)
+ * Typecasts a pointer to an Ewl_Scrollbar pointer.
+ */
#define EWL_SCROLLBAR(scrollbar) ((Ewl_Scrollbar *) scrollbar)
-struct _ewl_scrollbar {
- Ewl_Box box;
-
- Ewl_Widget *seeker;
- Ewl_Widget *button_decrement;
- Ewl_Widget *button_increment;
- Ewl_Alignment buttons_alignment;
-
- double fill_percentage;
+/**
+ * @struct Ewl_Scrollbar
+ * Inherits from Ewl_Box to layout an Ewl_Seeker and two Ewl_Buttons to
+ * provide scrollbar functionality.
+ */
+struct Ewl_Scrollbar
+{
+ Ewl_Box box; /**< Inherit from Ewl_Box */
+
+ Ewl_Widget *seeker; /**< The internal Ewl_Seeker */
+ Ewl_Widget *button_decrement; /**< The internal decrement button */
+ Ewl_Widget *button_increment; /**< The internal increment button */
+ Ewl_Alignment buttons_alignment; /**< The ordering of buttons */
- Ewl_ScrollBar_Flags flag;
+ double fill_percentage; /**< The ratio of size for draggable */
+ Ewl_ScrollBar_Flags flag; /**< Flags to indicate part visibility */
};
+/**
+ * @def ewl_hscrollbar_new()
+ * A shortcut for allocating a new horizontal scrollbar.
+ */
#define ewl_hscrollbar_new() ewl_scrollbar_new(EWL_ORIENTATION_HORIZONTAL)
+
+/**
+ * @def ewl_vscrollbar_new()
+ * A shortcut for allocating a new vertical scrollbar.
+ */
#define ewl_vscrollbar_new() ewl_scrollbar_new(EWL_ORIENTATION_VERTICAL)
Ewl_Widget *ewl_scrollbar_new(Ewl_Orientation orientation);
@@ -34,5 +63,9 @@
void ewl_scrollbar_set_flag(Ewl_Scrollbar * s,
Ewl_ScrollBar_Flags f);
Ewl_ScrollBar_Flags ewl_scrollbar_get_flag(Ewl_Scrollbar * s);
+
+/**
+ * @}
+ */
#endif /* __EWL_SCROLLBAR_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_scrollpane.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ewl_scrollpane.c 25 Aug 2003 19:40:42 -0000 1.20
+++ ewl_scrollpane.c 2 Sep 2003 21:57:13 -0000 1.21
@@ -56,7 +56,8 @@
ewl_container_init(EWL_CONTAINER(s), "scrollpane", __ewl_scrollpane_add,
__ewl_scrollpane_child_resize, NULL);
- ewl_object_set_fill_policy(EWL_OBJECT(s), EWL_FILL_POLICY_FILL);
+ ewl_object_set_fill_policy(EWL_OBJECT(s), EWL_FILL_POLICY_FILL |
+ EWL_FILL_POLICY_SHRINK);
/*
* Create the container to hold the contents and it's configure
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_textarea.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ewl_textarea.c 31 Aug 2003 05:47:09 -0000 1.14
+++ ewl_textarea.c 2 Sep 2003 21:57:13 -0000 1.15
@@ -213,6 +213,8 @@
etox_context_set_color(etox_get_context(ta->etox), r, g, b, a);
}
+ evas_object_clip_set(ta->etox, w->fx_clip_box);
+
/*
* Now set the text and display it.
*/
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
