Enlightenment CVS committal
Author : jethomas
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_scrollpane.c
Log Message:
Add unit tests and fixes for kinetic scrollpane.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_scrollpane.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- ewl_scrollpane.c 11 Feb 2008 03:00:31 -0000 1.35
+++ ewl_scrollpane.c 11 Feb 2008 22:00:02 -0000 1.36
@@ -231,8 +231,17 @@
ewl_scrollpane_cb_mouse_move_embedded);
}
if (s->kinfo)
+ {
IF_FREE(s->kinfo->extra)
- IF_FREE(s->kinfo);
+ }
+ else
+ {
+ s->kinfo = NEW(Ewl_Scrollpane_Scroll_Info_Base, 1);
+ s->kinfo->fps = 15;
+ s->kinfo->vmax = 50.0;
+ s->kinfo->vmin = 0.0;
+ s->kinfo->dampen = 0.95;
+ }
if (type == EWL_KINETIC_SCROLL_NORMAL)
{
@@ -242,16 +251,7 @@
ewl_scrollpane_cb_mouse_up_normal, s);
ewl_callback_append(s->overlay, EWL_CALLBACK_MOUSE_MOVE,
ewl_scrollpane_cb_mouse_move_normal, s);
-
- if (!s->kinfo)
- {
- s->kinfo = NEW(Ewl_Scrollpane_Scroll_Info_Base, 1);
- s->kinfo->extra =
NEW(Ewl_Scrollpane_Scroll_Info_Normal, 1);
- s->kinfo->fps = 15;
- s->kinfo->vmax = 50.0;
- s->kinfo->vmin = 0.0;
- s->kinfo->dampen = 0.95;
- }
+ s->kinfo->extra = NEW(Ewl_Scrollpane_Scroll_Info_Normal, 1);
}
else if (type == EWL_KINETIC_SCROLL_EMBEDDED)
@@ -263,15 +263,7 @@
ewl_callback_append(s->overlay, EWL_CALLBACK_MOUSE_MOVE,
ewl_scrollpane_cb_mouse_move_embedded, s);
- if (!s->kinfo)
- {
- s->kinfo = NEW(Ewl_Scrollpane_Scroll_Info_Base, 1);
- s->kinfo->extra =
NEW(Ewl_Scrollpane_Scroll_Info_Embedded, 1);
- s->kinfo->fps = 15;
- s->kinfo->vmax = 50.0;
- s->kinfo->vmin = 0.0;
- s->kinfo->dampen = 0.95;
- }
+ s->kinfo->extra = NEW(Ewl_Scrollpane_Scroll_Info_Embedded, 1);
}
s->type = type;
@@ -1337,7 +1329,7 @@
DCHECK_PARAM_PTR_RET(s, -1);
DCHECK_TYPE_RET(s, EWL_SCROLLPANE_TYPE, -1);
- DRETURN_INT(s->kinfo->vmin, DLEVEL_STABLE);
+ DRETURN_INT(s->kinfo->dampen, DLEVEL_STABLE);
}
/**
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
