1
0
Fork 0
forked from len0rd/rockbox
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17859 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Peter D'Hoye 2008-06-28 21:02:43 +00:00
parent 1f045bcb1e
commit 4af5dd84a2
3 changed files with 5 additions and 5 deletions

View file

@ -46,7 +46,7 @@ void gui_buttonbar_init(struct gui_buttonbar * buttonbar)
{ {
viewport_set_defaults(&bb_vp[i], i); viewport_set_defaults(&bb_vp[i], i);
bb_vp[i].font = FONT_SYSFIXED; bb_vp[i].font = FONT_SYSFIXED;
bb_vp[i].y = screens[i].height - BUTTONBAR_HEIGHT; bb_vp[i].y = screens[i].lcdheight - BUTTONBAR_HEIGHT;
bb_vp[i].height = BUTTONBAR_HEIGHT; bb_vp[i].height = BUTTONBAR_HEIGHT;
bb_vp[i].drawmode = DRMODE_COMPLEMENT; bb_vp[i].drawmode = DRMODE_COMPLEMENT;
} }
@ -65,7 +65,7 @@ static void gui_buttonbar_draw_button(struct gui_buttonbar * buttonbar, int num)
struct screen * display = buttonbar->display; struct screen * display = buttonbar->display;
struct viewport vp = bb_vp[display->screen_type]; struct viewport vp = bb_vp[display->screen_type];
button_width = display->width/BUTTONBAR_MAX_BUTTONS; button_width = display->lcdwidth/BUTTONBAR_MAX_BUTTONS;
vp.width = button_width; vp.width = button_width;
vp.x = button_width * num; vp.x = button_width * num;
display->set_viewport(&vp); display->set_viewport(&vp);

View file

@ -360,11 +360,11 @@ static int touchpad_slider(struct rgb_pick *rgb, int *selected_slider)
text_top = MARGIN_TOP + display->char_height + TITLE_MARGIN_BOTTOM + SELECTOR_TB_MARGIN; text_top = MARGIN_TOP + display->char_height + TITLE_MARGIN_BOTTOM + SELECTOR_TB_MARGIN;
slider_left = MARGIN_LEFT + SELECTOR_WIDTH + SELECTOR_LR_MARGIN + slider_left = MARGIN_LEFT + SELECTOR_WIDTH + SELECTOR_LR_MARGIN +
max_label_width + SLIDER_MARGIN_LEFT; max_label_width + SLIDER_MARGIN_LEFT;
slider_width = display->width - slider_left - SLIDER_MARGIN_RIGHT - slider_width = display->getwidth() - slider_left - SLIDER_MARGIN_RIGHT -
display->char_width*2 - SELECTOR_LR_MARGIN - SELECTOR_WIDTH - display->char_width*2 - SELECTOR_LR_MARGIN - SELECTOR_WIDTH -
MARGIN_RIGHT; MARGIN_RIGHT;
display_three_rows = display_three_rows =
display->height >= MARGIN_TOP + display->getheight() >= MARGIN_TOP +
display->char_height*4 + /* Title + 3 sliders */ display->char_height*4 + /* Title + 3 sliders */
TITLE_MARGIN_BOTTOM + TITLE_MARGIN_BOTTOM +
SELECTOR_TB_MARGIN*6 + /* 2 margins/slider */ SELECTOR_TB_MARGIN*6 + /* 2 margins/slider */

View file

@ -861,7 +861,7 @@ int radio_screen(void)
peak_meter_screen(&screens[i],0, peak_meter_screen(&screens[i],0,
STATUSBAR_HEIGHT + fh*(top_of_screen + 4), fh); STATUSBAR_HEIGHT + fh*(top_of_screen + 4), fh);
screens[i].update_rect(0, STATUSBAR_HEIGHT + fh*(top_of_screen + 4), screens[i].update_rect(0, STATUSBAR_HEIGHT + fh*(top_of_screen + 4),
screens[i].width, fh); screens[i].getwidth(), fh);
screens[i].set_viewport(NULL); screens[i].set_viewport(NULL);
} }
} }