devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Removing scroll acceleration for the release (don't worry, I've saved the patch)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1603 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2002-08-07 20:51:37 +00:00
parent 0b709e1fee
commit c1d9b15607
1 changed files with 2 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

115
apps/tree.c
View file

@ -267,7 +267,6 @@ bool dirbrowse(char *root)
int lasti=-1; int lasti=-1;
int rc; int rc;
int button; int button;
int browse_speed = 0;
memcpy(currdir,root,sizeof(currdir)); memcpy(currdir,root,sizeof(currdir));
@ -316,7 +315,6 @@ bool dirbrowse(char *root)
#ifdef HAVE_RECORDER_KEYPAD #ifdef HAVE_RECORDER_KEYPAD
case BUTTON_PLAY: case BUTTON_PLAY:
#endif #endif
browse_speed = 0;
if ( !numentries ) if ( !numentries )
break; break;
if ((currdir[0]=='/') && (currdir[1]==0)) { if ((currdir[0]=='/') && (currdir[1]==0)) {
@ -364,61 +362,8 @@ bool dirbrowse(char *root)
restore = true; restore = true;
break; break;
case TREE_PREV | BUTTON_REPEAT:
browse_speed++; /* increase the browse speed every time we get here */
if(filesindir) {
if(dircursor) {
if (browse_speed < TREE_MAX_ON_SCREEN - 1) {
/* moving the cursor up through a full screen */
put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor,
false);
dircursor--;
put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor, true);
}
else {
/* if we have wrapped from the bottom we want to keep up the speed */
put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor,
false);
dircursor=0;
put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor, true);
}
}
else {
if (start) {
/* leaving the cursor at top line and moving screen down */
if (browse_speed >=TREE_MAX_ON_SCREEN-1)
start = start - TREE_MAX_ON_SCREEN + 1;
else
start--;
if (start<0)
start=0;
numentries = showdir(currdir, start);
put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor, true);
}
else {
/* wrapping to the top in a directory that is not full */
if (numentries < TREE_MAX_ON_SCREEN) {
put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor,
false);
dircursor = numentries - 1;
browse_speed=0;
put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor,
true);
}
else {
/* starting at the very bottom after a wrap */
start = numentries - TREE_MAX_ON_SCREEN;
dircursor = TREE_MAX_ON_SCREEN - 1;
numentries = showdir(currdir, start);
put_cursorxy(0, CURSOR_Y + LINE_Y +
TREE_MAX_ON_SCREEN - 1, true);
}
}
}
}
break;
case TREE_PREV: case TREE_PREV:
browse_speed = 0; case TREE_PREV | BUTTON_REPEAT:
if(filesindir) { if(filesindir) {
if(dircursor) { if(dircursor) {
put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor, false); put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor, false);
@ -451,63 +396,9 @@ bool dirbrowse(char *root)
lcd_update(); lcd_update();
} }
break; break;
case TREE_NEXT | BUTTON_REPEAT:
browse_speed++; /* increase the browse speed every time we get here */
if(filesindir)
{
if (dircursor + start + 1 < numentries ) {
if(dircursor+1 < TREE_MAX_ON_SCREEN) {
if (browse_speed < 7) {
/* moving the cursor down through a full screen */
put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor,
false);
dircursor++;
put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor, true);
}
else {
/* if we have wrapped from the bottom we want to keep up the speed */
put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor,
false);
dircursor=7;
put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor, true);
}
}
else {
/* leaving the cursor at bottom line and moving screen up */
if (browse_speed >= TREE_MAX_ON_SCREEN-1)
/* make sure we do not go past the end of the directory */
if (start + TREE_MAX_ON_SCREEN - 1 < numentries-TREE_MAX_ON_SCREEN)
start = start + TREE_MAX_ON_SCREEN -1;
else
start = numentries-TREE_MAX_ON_SCREEN;
else
start++;
numentries = showdir(currdir, start);
put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor, true);
}
}
else {
/* restarting at the top when there is less than 7 files */
if(numentries < TREE_MAX_ON_SCREEN) {
put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor,
false);
start = dircursor = browse_speed = 0;
put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor, true);
}
else {
/* restarting at the top when the screen scrolls */
start = dircursor = 0 ;
numentries = showdir(currdir, start);
put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor, true);
}
}
lcd_update();
}
break;
case TREE_NEXT: case TREE_NEXT:
browse_speed = 0; case TREE_NEXT | BUTTON_REPEAT:
if(filesindir) if(filesindir)
{ {
if (dircursor + start + 1 < numentries ) { if (dircursor + start + 1 < numentries ) {
@ -546,7 +437,6 @@ bool dirbrowse(char *root)
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
bool laststate=statusbar(false); bool laststate=statusbar(false);
#endif #endif
browse_speed = 0;
lcd_stop_scroll(); lcd_stop_scroll();
main_menu(); main_menu();
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
@ -561,7 +451,6 @@ bool dirbrowse(char *root)
} }
case BUTTON_ON: case BUTTON_ON:
browse_speed = 0;
if (mpeg_is_playing()) if (mpeg_is_playing())
{ {
lcd_stop_scroll(); lcd_stop_scroll();