freemyipod r695 - Code Review

Repository:	freemyipod
Revision:	< r694‎ \| r695 \| r696 >
Date:	14:48, 20 April 2011
Author:	theseven
Status:	new
Tags:
Comment:	libui: iconflow: fix hard jumps when moving by pressing a button while idle
Modified paths:	/libs/ui/chooser_renderer_iconflow.c (modified) (history)

Diff [purge]

Index: libs/ui/chooser_renderer_iconflow.c
—	—	@@ -37,7 +37,7 @@
38	38	struct chooser_renderer_iconflow_data* rdata;
39	39	rdata = (struct chooser_renderer_iconflow_data*)(data->rendererdata);
40	40	rdata->viewposition = params->startposition * data->info->actionhandler->stepsperitem(data);
41		~~- rdata->accumulator = 0;~~
	41	+ rdata->accumulator = 0;
42	42	rdata->lastupdate = USEC_TIMER;
43	43	return 0;
44	44	}
—	—	@@ -60,14 +60,19 @@
61	61	rdata = (struct chooser_renderer_iconflow_data*)(data->rendererdata);
62	62	long time = USEC_TIMER;
63	63	long timediff = time - rdata->lastupdate;
64		~~- int distance = data->position - rdata->viewposition;~~
65		~~- if (distance) rc = CHOOSER_RESULT_REDRAW;~~
66		~~- int factor = params->smoothness / timediff + 1;~~
	64	+ if (!timediff) timediff = 1;
	65	+ int distance;
	66	+ if (!rdata->lastupdate) distance = 0;
	67	+ else distance = data->position - rdata->viewposition;
	68	+ int factor = params->smoothness / timediff;
	69	+ if (!factor) factor = 1;
67	70	rdata->accumulator += distance;
68	71	distance = rdata->accumulator / factor;
69	72	rdata->accumulator -= distance * factor;
70	73	rdata->viewposition += distance;
71	74	rdata->lastupdate = time;
	75	+ if (data->position - rdata->viewposition) rc = CHOOSER_RESULT_REDRAW;
	76	+ else rdata->lastupdate = 0;
72	77	if (params->copy_dest.buf.addr == params->fill_dest.loc.buf.addr
73	78	&& params->copy_dest.buf.stride == params->fill_dest.loc.buf.stride
74	79	&& params->copy_dest.pos.x == params->fill_dest.loc.pos.x