Enlightenment CVS committal Author : sebastid Project : e17 Module : apps/e
Dir : e17/apps/e/src/bin Modified Files: e_scrollbar.c Log Message: style =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_scrollbar.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_scrollbar.c 6 Oct 2005 22:35:21 -0000 1.6 +++ e_scrollbar.c 11 Oct 2005 16:59:02 -0000 1.7 @@ -16,11 +16,11 @@ Evas_Object *edje_object; struct { - double min; - double max; - double current; + double min; + double max; + double current; } value; - + E_Scrollbar_Direction direction; Evas_List *callbacks; @@ -79,18 +79,18 @@ switch (dir) { case E_SCROLLBAR_HORIZONTAL: - e_theme_edje_object_set(sd->edje_object, - "base/theme/widgets/hscrollbar", - "widgets/hscrollbar"); - sd->direction = dir; - break; + e_theme_edje_object_set(sd->edje_object, + "base/theme/widgets/hscrollbar", + "widgets/hscrollbar"); + sd->direction = dir; + break; case E_SCROLLBAR_VERTICAL: - e_theme_edje_object_set(sd->edje_object, - "base/theme/widgets/vscrollbar", - "widgets/vscrollbar"); - sd->direction = dir; - break; + e_theme_edje_object_set(sd->edje_object, + "base/theme/widgets/vscrollbar", + "widgets/vscrollbar"); + sd->direction = dir; + break; } } @@ -131,7 +131,7 @@ return; sd->value.current = value; - + if (sd->direction == E_SCROLLBAR_HORIZONTAL) edje_object_part_drag_value_set(sd->edje_object, "drag", value, 0); else @@ -166,13 +166,15 @@ return; if (sd->direction == E_SCROLLBAR_HORIZONTAL) - { - edje_object_part_drag_step_set(sd->edje_object, "drag", step, 0); - edje_object_part_drag_page_set(sd->edje_object, "drag", page, 0); - } else { - edje_object_part_drag_step_set(sd->edje_object, "drag", 0, step); - edje_object_part_drag_page_set(sd->edje_object, "drag", 0, page); - } + { + edje_object_part_drag_step_set(sd->edje_object, "drag", step, 0); + edje_object_part_drag_page_set(sd->edje_object, "drag", page, 0); + } + else + { + edje_object_part_drag_step_set(sd->edje_object, "drag", 0, step); + edje_object_part_drag_page_set(sd->edje_object, "drag", 0, page); + } } void @@ -189,13 +191,15 @@ edje_object_part_drag_page_get(sd->edje_object, "drag", &pagex, &pagey); if (sd->direction == E_SCROLLBAR_HORIZONTAL) - { - *step = stepx; - *page = pagex; - } else { - *step = stepy; - *page = pagey; - } + { + if (step) *step = stepx; + if (page) *page = pagex; + } + else + { + if (step) *step = stepy; + if (page) *page = pagey; + } } ------------------------------------------------------- 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