Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

FIX RED/YELLOW framebuffer viewport rewrite

Browse source 
Change-Id: Icfd3b00b646c593991f73550d8a316a80e5930a1
This commit is contained in:
William Wilgus 2020-10-26 13:41:38 -04:00
parent 40e98a2e49
commit 9b295ce135
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/plugins/reversi/reversi-gui.c
View file

@ -196,15 +196,18 @@ static bool game_finished;
* char *title - Specify a title * char *title - Specify a title
* fb_data *pixmap- Currently unused, but will allow for a graphic * fb_data *pixmap- Currently unused, but will allow for a graphic
*/ */
struct touchbutton reversi_buttons[TOUCHBUTTON_COUNT] = struct touchbutton reversi_buttons[TOUCHBUTTON_COUNT] =
{ {
{ {B_MENU_X, B_MENU_Y, B_MENU_W, B_MENU_H, 0, FONT_UI, DRMODE_SOLID, 0, 0xFFFF}, { {.x=B_MENU_X, .y=B_MENU_Y, .width=B_MENU_W, .height=B_MENU_H, .flags=0, .buffer= 0,
.font=FONT_UI, .drawmode=DRMODE_SOLID, .fg_pattern=0, .bg_pattern=0xFFFF},
false, REVERSI_BUTTON_MENU, false, "Menu", NULL }, false, REVERSI_BUTTON_MENU, false, "Menu", NULL },
{ {B_QUIT_X, B_QUIT_Y, B_QUIT_W, B_QUIT_H, 0, FONT_UI, DRMODE_SOLID, 0, 0xFFFF}, { {.x=B_QUIT_X, .y=B_QUIT_Y, .width=B_QUIT_W, .height=B_QUIT_H, .flags=0, .buffer=0,
.font=FONT_UI, .drawmode=DRMODE_SOLID, .fg_pattern=0, .bg_pattern=0xFFFF},
false, REVERSI_BUTTON_QUIT, false, "Quit", NULL }, false, REVERSI_BUTTON_QUIT, false, "Quit", NULL },
{ {0, 0, XOFS+BOARD_WIDTH, YOFS+BOARD_HEIGHT, 0, 0, DRMODE_SOLID, 0, 0xFFFF}, { {.x=0, .y=0, .width=XOFS+BOARD_WIDTH,.height=YOFS+BOARD_HEIGHT, .flags=0, .buffer=0,
.font=0, .drawmode=DRMODE_SOLID, .fg_pattern=0, .bgpattern=0xFFFF},
false, REVERSI_BUTTON_MAKE_MOVE, true, NULL, NULL } false, REVERSI_BUTTON_MAKE_MOVE, true, NULL, NULL }
}; };
#endif #endif

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

@ -332,7 +332,7 @@ static void LCDFN(putsxyofs)(int x, int y, int ofs, const unsigned char *str)
static void LCDFN(putsxyofs)(int x, int y, int ofs, const unsigned char *str) static void LCDFN(putsxyofs)(int x, int y, int ofs, const unsigned char *str)
{ {
unsigned short *ucs; unsigned short *ucs;
struct font* pf = font_get(current_vp->font); struct font* pf = font_get(LCDFN(current_vp)->font);
int vp_flags = current_vp->flags; int vp_flags = current_vp->flags;
const unsigned char *bits; const unsigned char *bits;
int width; int width;