forked from len0rd/rockbox
dump the old scrollbar(), make it a wrapper to gui_scrollbar_draw() only
drawing to the main LCD. Saves ~400bytes on the recorder. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11530 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
3fb591c6af
commit
9270ee6aab
1 changed files with 3 additions and 75 deletions
|
@ -18,8 +18,7 @@
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
#include <lcd.h>
|
#include <lcd.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
#include "scrollbar.h"
|
||||||
#include "widgets.h"
|
|
||||||
|
|
||||||
#ifdef HAVE_LCD_BITMAP
|
#ifdef HAVE_LCD_BITMAP
|
||||||
|
|
||||||
|
@ -29,79 +28,8 @@
|
||||||
void scrollbar(int x, int y, int width, int height, int items, int min_shown,
|
void scrollbar(int x, int y, int width, int height, int items, int min_shown,
|
||||||
int max_shown, int orientation)
|
int max_shown, int orientation)
|
||||||
{
|
{
|
||||||
int min;
|
gui_scrollbar_draw(&screens[SCREEN_MAIN],x,y,width,height,
|
||||||
int max;
|
items,min_shown, max_shown, orientation);
|
||||||
int inner_len;
|
|
||||||
int start;
|
|
||||||
int size;
|
|
||||||
|
|
||||||
/* draw box */
|
|
||||||
lcd_drawrect(x, y, width, height);
|
|
||||||
|
|
||||||
lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID);
|
|
||||||
|
|
||||||
/* clear edge pixels */
|
|
||||||
lcd_drawpixel(x, y);
|
|
||||||
lcd_drawpixel((x + width - 1), y);
|
|
||||||
lcd_drawpixel(x, (y + height - 1));
|
|
||||||
lcd_drawpixel((x + width - 1), (y + height - 1));
|
|
||||||
|
|
||||||
/* clear pixels in progress bar */
|
|
||||||
lcd_fillrect(x + 1, y + 1, width - 2, height - 2);
|
|
||||||
|
|
||||||
/* min should be min */
|
|
||||||
if(min_shown < max_shown) {
|
|
||||||
min = min_shown;
|
|
||||||
max = max_shown;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
min = max_shown;
|
|
||||||
max = min_shown;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* limit min and max */
|
|
||||||
if(min < 0)
|
|
||||||
min = 0;
|
|
||||||
if(min > items)
|
|
||||||
min = items;
|
|
||||||
|
|
||||||
if(max < 0)
|
|
||||||
max = 0;
|
|
||||||
if(max > items)
|
|
||||||
max = items;
|
|
||||||
|
|
||||||
if (orientation == VERTICAL)
|
|
||||||
inner_len = height - 2;
|
|
||||||
else
|
|
||||||
inner_len = width - 2;
|
|
||||||
|
|
||||||
/* avoid overflows */
|
|
||||||
while (items > (INT_MAX / inner_len)) {
|
|
||||||
items >>= 1;
|
|
||||||
min >>= 1;
|
|
||||||
max >>= 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* calc start and end of the knob */
|
|
||||||
if (items > 0 && items > (max - min)) {
|
|
||||||
size = inner_len * (max - min) / items;
|
|
||||||
if (size == 0) { /* width of knob is null */
|
|
||||||
size = 1;
|
|
||||||
start = (inner_len - 1) * min / items;
|
|
||||||
} else {
|
|
||||||
start = (inner_len - size) * min / (items - (max - min));
|
|
||||||
}
|
|
||||||
} else { /* if null draw full bar */
|
|
||||||
size = inner_len;
|
|
||||||
start = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
lcd_set_drawmode(DRMODE_SOLID);
|
|
||||||
|
|
||||||
if(orientation == VERTICAL)
|
|
||||||
lcd_fillrect(x + 1, y + start + 1, width - 2, size);
|
|
||||||
else
|
|
||||||
lcd_fillrect(x + start + 1, y + 1, size, height - 2);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue