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

Use macro to test viewport's RTL flag

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22978 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Tomer Shalev 2009-10-06 08:07:30 +00:00
parent 8b6161b24b
commit a092b9ce92
4 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
apps/gui/bitmap/list.c
View file

@ -42,7 +42,6 @@
#include "viewport.h" #include "viewport.h"
#define ICON_PADDING 1 #define ICON_PADDING 1
#define IS_RTL(vp) (((vp)->flags & VP_IS_RTL) != 0)
/* these are static to make scrolling work */ /* these are static to make scrolling work */
static struct viewport list_text[NB_SCREENS], title_text[NB_SCREENS]; static struct viewport list_text[NB_SCREENS], title_text[NB_SCREENS];
@ -83,7 +82,7 @@ static bool draw_title(struct screen *display, struct gui_synclist *list)
struct viewport title_icon = *title_text_vp; struct viewport title_icon = *title_text_vp;
title_icon.width = get_icon_width(screen) + ICON_PADDING * 2; title_icon.width = get_icon_width(screen) + ICON_PADDING * 2;
if (IS_RTL(&title_icon)) if (VP_IS_RTL(&title_icon))
{ {
title_icon.x = title_text_vp->width - title_icon.width; title_icon.x = title_text_vp->width - title_icon.width;
} }
@ -155,19 +154,19 @@ void list_draw(struct screen *display, struct gui_synclist *list)
else else
vp.x += list_text_vp->width; vp.x += list_text_vp->width;
display->set_viewport(&vp); display->set_viewport(&vp);
gui_scrollbar_draw(display, IS_RTL(&vp) ? 1 : 0, 0, SCROLLBAR_WIDTH-1, vp.height, gui_scrollbar_draw(display, VP_IS_RTL(&vp) ? 1 : 0, 0, SCROLLBAR_WIDTH-1, vp.height,
list->nb_items, list_start_item, list_start_item + end-start, list->nb_items, list_start_item, list_start_item + end-start,
VERTICAL); VERTICAL);
} }
else if (show_title) else if (show_title)
{ {
/* shift everything a bit in relation to the title... */ /* shift everything a bit in relation to the title... */
if (!IS_RTL(list_text_vp) && scrollbar_in_left) if (!VP_IS_RTL(list_text_vp) && scrollbar_in_left)
{ {
list_text_vp->width -= SCROLLBAR_WIDTH; list_text_vp->width -= SCROLLBAR_WIDTH;
list_text_vp->x += SCROLLBAR_WIDTH; list_text_vp->x += SCROLLBAR_WIDTH;
} }
else if (IS_RTL(list_text_vp) && !scrollbar_in_left) else if (VP_IS_RTL(list_text_vp) && !scrollbar_in_left)
{ {
list_text_vp->width -= SCROLLBAR_WIDTH; list_text_vp->width -= SCROLLBAR_WIDTH;
} }
@ -183,7 +182,7 @@ void list_draw(struct screen *display, struct gui_synclist *list)
{ {
list_icons.width = icon_width * icon_count; list_icons.width = icon_width * icon_count;
list_text_vp->width -= list_icons.width + ICON_PADDING; list_text_vp->width -= list_icons.width + ICON_PADDING;
if (IS_RTL(&list_icons)) if (VP_IS_RTL(&list_icons))
list_icons.x += list_text_vp->width + ICON_PADDING; list_icons.x += list_text_vp->width + ICON_PADDING;
else else
list_text_vp->x += list_icons.width + ICON_PADDING; list_text_vp->x += list_icons.width + ICON_PADDING;

4
apps/gui/viewport.c
View file

@ -151,8 +151,8 @@ void viewport_set_defaults(struct viewport *vp, enum screen_type screen)
viewport_set_fullscreen(vp, screen); viewport_set_fullscreen(vp, screen);
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
vp->flags &= ~VP_IS_RTL; vp->flags &= ~VP_FLAG_IS_RTL;
vp->flags |= lang_is_rtl() ? VP_IS_RTL : 0; vp->flags |= lang_is_rtl() ? VP_FLAG_IS_RTL : 0;
#endif #endif
} }

2
firmware/drivers/lcd-bitmap-common.c
View file

@ -177,7 +177,7 @@ void LCDFN(puts_style_offset)(int x, int y, const unsigned char *str,
chars_in_str = utf8length((char *)str); chars_in_str = utf8length((char *)str);
LCDFN(getstringsize)(str, &w, &h); LCDFN(getstringsize)(str, &w, &h);
xpos = x * w / chars_in_str; xpos = x * w / chars_in_str;
if (current_vp->flags & VP_IS_RTL) if (VP_IS_RTL(current_vp))
xpos = current_vp->width - w - xpos; xpos = current_vp->width - w - xpos;
ypos = y * h; ypos = y * h;
LCDFN(putsxyofs_style)(xpos, ypos, str, style, w, h, offset); LCDFN(putsxyofs_style)(xpos, ypos, str, style, w, h, offset);

4
firmware/export/lcd.h
View file

@ -26,7 +26,9 @@
#include "cpu.h" #include "cpu.h"
#include "config.h" #include "config.h"
#define VP_IS_RTL 0x01 #define VP_FLAG_IS_RTL 0x01
#define VP_IS_RTL(vp) (((vp)->flags & VP_FLAG_IS_RTL) != 0)
struct viewport { struct viewport {
int x; int x;