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

color_picker: a bit of rework for color_picker.

Browse source 
* don't call display->getcharheight() so often, store the value to char_height and use it instead.
* replay title_height by char_height, they should be the same.
* fix spaces.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24595 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Teruaki Kawashima 2010-02-11 14:18:31 +00:00
parent ad2ee3094f
commit 1549b19d9e
3 changed files with 66 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

131
apps/gui/color_picker.c
View file

@ -155,13 +155,13 @@ static void draw_screen(struct screen *display, char *title,
unsigned text_color = LCD_BLACK; unsigned text_color = LCD_BLACK;
unsigned background_color = LCD_WHITE; unsigned background_color = LCD_WHITE;
char buf[32]; char buf[32];
int i, text_x, y, line_height; int i, char_height, line_height;
int text_top; int max_label_width;
int text_x, text_top;
int slider_x, slider_width; int slider_x, slider_width;
bool display_three_rows; bool display_three_rows;
int max_label_width;
struct viewport vp; struct viewport vp;
viewport_set_defaults(&vp, display->screen_type); viewport_set_defaults(&vp, display->screen_type);
display->set_viewport(&vp); display->set_viewport(&vp);
@ -173,30 +173,30 @@ static void draw_screen(struct screen *display, char *title,
background_color = display->get_background(); background_color = display->get_background();
} }
max_label_width = label_get_max_width(display);
/* Draw title string */ /* Draw title string */
set_drawinfo(display, DRMODE_SOLID, text_color, background_color); set_drawinfo(display, DRMODE_SOLID, text_color, background_color);
vp.flags |= VP_FLAG_ALIGN_CENTER; vp.flags |= VP_FLAG_ALIGN_CENTER;
display->getstringsize(title, NULL, &y);
display->putsxy(0, MARGIN_TOP, title); display->putsxy(0, MARGIN_TOP, title);
/* Get slider positions and top starting position */ /* Get slider positions and top starting position */
text_top = MARGIN_TOP + y + TITLE_MARGIN_BOTTOM + SELECTOR_TB_MARGIN; max_label_width = label_get_max_width(display);
char_height = display->getcharheight();
text_top = MARGIN_TOP + char_height +
TITLE_MARGIN_BOTTOM + SELECTOR_TB_MARGIN;
text_x = SELECTOR_WIDTH; text_x = SELECTOR_WIDTH;
slider_x = text_x + max_label_width + SLIDER_TEXT_MARGIN; slider_x = text_x + max_label_width + SLIDER_TEXT_MARGIN;
slider_width = vp.width - slider_x*2 - max_label_width; slider_width = vp.width - slider_x*2 - max_label_width;
line_height = display->getcharheight() + 2*SELECTOR_TB_MARGIN; line_height = char_height + 2*SELECTOR_TB_MARGIN;
/* Find out if there's enough room for three sliders or just /* Find out if there's enough room for three sliders or just
enough to display the selected slider - calculate total height enough to display the selected slider - calculate total height
of display with three sliders present */ of display with three sliders present */
display_three_rows = display_three_rows =
vp.height >= vp.height >=
text_top + line_height*3 + /* Title + 3 sliders */ text_top + line_height*3 + /* Title + 3 sliders */
SWATCH_TOP_MARGIN + /* at least 2 lines */ SWATCH_TOP_MARGIN + /* at least 2 lines */
display->getcharheight()*2 + /* + margins for bottom */ char_height*2 + /* + margins for bottom */
MARGIN_BOTTOM; /* colored rectangle */ MARGIN_BOTTOM; /* colored rectangle */
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
@ -207,8 +207,7 @@ static void draw_screen(struct screen *display, char *title,
if (i == row) if (i == row)
{ {
set_drawinfo(display, DRMODE_SOLID, text_color, set_drawinfo(display, DRMODE_SOLID, text_color, background_color);
background_color);
if (global_settings.cursor_style != 0) if (global_settings.cursor_style != 0)
{ {
@ -216,8 +215,7 @@ static void draw_screen(struct screen *display, char *title,
display->fillrect(0, display->fillrect(0,
text_top - SELECTOR_TB_MARGIN, text_top - SELECTOR_TB_MARGIN,
vp.width, vp.width,
display->getcharheight() + char_height + SELECTOR_TB_MARGIN*2);
SELECTOR_TB_MARGIN*2);
if (display->depth < 16) if (display->depth < 16)
{ {
@ -228,13 +226,11 @@ static void draw_screen(struct screen *display, char *title,
else if (display_three_rows) else if (display_three_rows)
{ {
/* Draw "> <" around sliders */ /* Draw "> <" around sliders */
int top = text_top + (display->getcharheight() - int top = text_top + (char_height - SELECTOR_HEIGHT) / 2;
SELECTOR_HEIGHT) / 2;
screen_put_iconxy(display, 0, top, Icon_Cursor); screen_put_iconxy(display, 0, top, Icon_Cursor);
screen_put_iconxy(display, screen_put_iconxy(display,
vp.width - vp.width - SELECTOR_WIDTH,
get_icon_width(display->screen_type), top, Icon_Cursor);
top, Icon_Cursor);
} }
if (display->depth >= 16) if (display->depth >= 16)
@ -261,15 +257,15 @@ static void draw_screen(struct screen *display, char *title,
display->putsxy(text_x, text_top, buf); display->putsxy(text_x, text_top, buf);
/* Draw scrollbar */ /* Draw scrollbar */
gui_scrollbar_draw(display, /* screen */ gui_scrollbar_draw(display, /* screen */
slider_x, /* x */ slider_x, /* x */
text_top + display->getcharheight() / 4,/* y */ text_top + char_height / 4, /* y */
slider_width, /* width */ slider_width, /* width */
display->getcharheight() / 2, /* height */ char_height / 2, /* height */
rgb_max[i], /* items */ rgb_max[i], /* items */
0, /* min_shown */ 0, /* min_shown */
rgb->rgb_val[i], /* max_shown */ rgb->rgb_val[i], /* max_shown */
sb_flags); /* flags */ sb_flags); /* flags */
/* Advance to next line */ /* Advance to next line */
text_top += line_height; text_top += line_height;
@ -287,7 +283,7 @@ static void draw_screen(struct screen *display, char *title,
int height = vp.height - top - MARGIN_BOTTOM; int height = vp.height - top - MARGIN_BOTTOM;
/* Only draw if room */ /* Only draw if room */
if (height >= display->getcharheight() + 2) if (height >= char_height + 2)
{ {
/* draw the big rectangle */ /* draw the big rectangle */
display->set_foreground(rgb->color); display->set_foreground(rgb->color);
@ -296,67 +292,61 @@ static void draw_screen(struct screen *display, char *title,
/* Draw RGB: #rrggbb in middle of swatch */ /* Draw RGB: #rrggbb in middle of swatch */
set_drawinfo(display, DRMODE_FG, get_black_or_white(rgb), set_drawinfo(display, DRMODE_FG, get_black_or_white(rgb),
background_color); background_color);
display->getstringsize(buf, NULL, &y);
display->putsxy(0, top + (height - y) / 2, buf); display->putsxy(0, top + (height - char_height) / 2, buf);
/* Draw border around the rect */ /* Draw border around the rect */
set_drawinfo(display, DRMODE_SOLID, text_color, set_drawinfo(display, DRMODE_SOLID, text_color, background_color);
background_color);
display->drawrect(text_x, top, width, height); display->drawrect(text_x, top, width, height);
} }
} }
else else
{ {
/* Display RGB value only centered on remaining display if room */ /* Display RGB value only centered on remaining display if room */
display->getstringsize(buf, NULL, &y); int top = text_top + SWATCH_TOP_MARGIN;
i = text_top + SWATCH_TOP_MARGIN; int height = vp.height - top - MARGIN_BOTTOM;
if (i + y <= display->getheight() - MARGIN_BOTTOM) if (height >= char_height)
{ {
set_drawinfo(display, DRMODE_SOLID, text_color, background_color); set_drawinfo(display, DRMODE_SOLID, text_color, background_color);
display->putsxy(0, (i + vp.height - MARGIN_BOTTOM - y) / 2, buf); display->putsxy(0, top + (height - char_height) / 2, buf);
} }
} }
display->setfont(FONT_UI);
display->update_viewport(); display->update_viewport();
display->set_viewport(NULL); display->set_viewport(NULL);
/* Be sure screen mode is reset */
set_drawinfo(display, DRMODE_SOLID, text_color, background_color);
} }
#ifdef HAVE_TOUCHSCREEN #ifdef HAVE_TOUCHSCREEN
static int touchscreen_slider(struct screen *display, static int touchscreen_slider(struct screen *display,
struct rgb_pick *rgb, struct rgb_pick *rgb,
const char* title,
int *selected_slider) int *selected_slider)
{ {
short x,y; short x, y;
int text_top, slider_x, slider_width, title_height; int char_height, line_height;
int button;
bool display_three_rows;
int max_label_width; int max_label_width;
int pressed_slider; int text_top, slider_x, slider_width;
bool display_three_rows;
int button;
int pressed_slider;
struct viewport vp; struct viewport vp;
int line_height;
viewport_set_defaults(&vp, display->screen_type); viewport_set_defaults(&vp, display->screen_type);
display->set_viewport(&vp);
max_label_width = label_get_max_width(display);
display->getstringsize(title, NULL, &title_height);
button = action_get_touchscreen_press_in_vp(&x, &y, &vp); button = action_get_touchscreen_press_in_vp(&x, &y, &vp);
if (button == ACTION_UNKNOWN || button == BUTTON_NONE) if (button == ACTION_UNKNOWN || button == BUTTON_NONE)
return ACTION_NONE; return ACTION_NONE;
/* Get slider positions and top starting position /* Get slider positions and top starting position
* need vp.y here, because of the statusbar, since touchscreen * need vp.y here, because of the statusbar, since touchscreen
* coordinates are absolute */ * coordinates are absolute */
text_top = MARGIN_TOP + title_height + TITLE_MARGIN_BOTTOM + max_label_width = label_get_max_width(display);
SELECTOR_TB_MARGIN; char_height = display->getcharheight();
text_top = MARGIN_TOP + char_height +
TITLE_MARGIN_BOTTOM + SELECTOR_TB_MARGIN;
slider_x = SELECTOR_WIDTH + max_label_width + SLIDER_TEXT_MARGIN; slider_x = SELECTOR_WIDTH + max_label_width + SLIDER_TEXT_MARGIN;
slider_width = vp.width - slider_x*2 - max_label_width; slider_width = vp.width - slider_x*2 - max_label_width;
line_height = display->getcharheight() + 2*SELECTOR_TB_MARGIN; line_height = char_height + 2*SELECTOR_TB_MARGIN;
/* same logic as in draw_screen */ /* same logic as in draw_screen */
/* Find out if there's enough room for three sliders or just /* Find out if there's enough room for three sliders or just
@ -364,23 +354,27 @@ static int touchscreen_slider(struct screen *display,
of display with three sliders present */ of display with three sliders present */
display_three_rows = display_three_rows =
vp.height >= vp.height >=
text_top + title_height*3 + /* Title + 3 sliders */ text_top + line_height*3 + /* Title + 3 sliders */
SWATCH_TOP_MARGIN + /* at least 2 lines */ SWATCH_TOP_MARGIN + /* at least 2 lines */
display->getcharheight()*2 + /* + margins for bottom */ char_height*2 + /* + margins for bottom */
MARGIN_BOTTOM; /* colored rectangle */ MARGIN_BOTTOM; /* colored rectangle */
display->set_viewport(NULL);
if (y < text_top) if (y < text_top)
{ {
if (button == BUTTON_REL) if (button == BUTTON_REL)
return ACTION_STD_CANCEL; return ACTION_STD_CANCEL;
else
return ACTION_NONE;
} }
vp.y += text_top; if (y >= text_top + line_height * (display_three_rows ? 3:1))
vp.height = line_height * (display_three_rows ? 3:1);
if (!viewport_point_within_vp(&vp, x, y))
{ /* touching the color area means accept */ { /* touching the color area means accept */
if (button == BUTTON_REL) if (button == BUTTON_REL)
return ACTION_STD_OK; return ACTION_STD_OK;
else
return ACTION_NONE;
} }
/* y is relative to the original viewport */ /* y is relative to the original viewport */
pressed_slider = (y - text_top)/line_height; pressed_slider = (y - text_top)/line_height;
@ -388,8 +382,7 @@ static int touchscreen_slider(struct screen *display,
*selected_slider = pressed_slider; *selected_slider = pressed_slider;
/* add max_label_width to overcome integer division limits, /* add max_label_width to overcome integer division limits,
* cap value later since that may lead to an overflow */ * cap value later since that may lead to an overflow */
if (x < slider_x+(slider_width+max_label_width) && if (x < slider_x + (slider_width+max_label_width) && x > slider_x)
x > slider_x)
{ {
char computed_val; char computed_val;
x -= slider_x; x -= slider_x;
@ -407,8 +400,8 @@ static int touchscreen_slider(struct screen *display,
color is a pointer to the colour (in native format) to modify color is a pointer to the colour (in native format) to modify
set banned_color to -1 to allow all set banned_color to -1 to allow all
***********/ ***********/
bool set_color(struct screen *display, char *title, unsigned *color, bool set_color(struct screen *display, char *title,
unsigned banned_color) unsigned *color, unsigned banned_color)
{ {
int exit = 0, slider = 0; int exit = 0, slider = 0;
struct rgb_pick rgb; struct rgb_pick rgb;
@ -436,7 +429,7 @@ bool set_color(struct screen *display, char *title, unsigned *color,
#ifdef HAVE_TOUCHSCREEN #ifdef HAVE_TOUCHSCREEN
if (button == ACTION_TOUCHSCREEN if (button == ACTION_TOUCHSCREEN
&& display->screen_type == SCREEN_MAIN) && display->screen_type == SCREEN_MAIN)
button = touchscreen_slider(display, &rgb, title, &slider); button = touchscreen_slider(display, &rgb, &slider);
#endif #endif
switch (button) switch (button)

4
apps/gui/color_picker.h
View file

@ -22,7 +22,7 @@
#ifdef HAVE_LCD_COLOR /* this file is a bit useless on non color lcds.. */ #ifdef HAVE_LCD_COLOR /* this file is a bit useless on non color lcds.. */
bool set_color(struct screen *display, char *title, unsigned *color, bool set_color(struct screen *display, char *title,
unsigned banned_color); unsigned *color, unsigned banned_color);
#endif #endif

4
apps/plugin.h
View file

@ -686,8 +686,8 @@ struct plugin_api {
bool (*set_bool)(const char* string, const bool* variable ); bool (*set_bool)(const char* string, const bool* variable );
#ifdef HAVE_LCD_COLOR #ifdef HAVE_LCD_COLOR
bool (*set_color)(struct screen *display, char *title, unsigned *color, bool (*set_color)(struct screen *display, char *title,
unsigned banned_color); unsigned *color, unsigned banned_color);
#endif #endif
/* action handling */ /* action handling */
int (*get_custom_action)(int context,int timeout, int (*get_custom_action)(int context,int timeout,