very dirty fix
This commit is contained in:
parent
1445173ac6
commit
0a31b48c5a
5
glcd.c
5
glcd.c
@ -73,6 +73,7 @@ static const struct GLCDDriverVMT vmt = {
|
|||||||
uint16_t lcd_width, lcd_height;
|
uint16_t lcd_width, lcd_height;
|
||||||
uint16_t bgcolor = White, fgcolor = Black;
|
uint16_t bgcolor = White, fgcolor = Black;
|
||||||
uint16_t cx = 0, cy = 0;
|
uint16_t cx = 0, cy = 0;
|
||||||
|
uint16_t cursor_x = 0, cursor_y = 0;
|
||||||
static uint8_t tpText = 0;
|
static uint8_t tpText = 0;
|
||||||
const uint8_t* font;
|
const uint8_t* font;
|
||||||
|
|
||||||
@ -272,6 +273,7 @@ size_t lcdPutString(const char *str) {
|
|||||||
|
|
||||||
void lcdMoveCursor(uint16_t x, uint16_t y, uint16_t color, uint16_t bkcolor) {
|
void lcdMoveCursor(uint16_t x, uint16_t y, uint16_t color, uint16_t bkcolor) {
|
||||||
cx = x;
|
cx = x;
|
||||||
|
cursor_x = x;
|
||||||
cy = y;
|
cy = y;
|
||||||
bgcolor = bkcolor;
|
bgcolor = bkcolor;
|
||||||
fgcolor = color;
|
fgcolor = color;
|
||||||
@ -317,8 +319,7 @@ uint16_t lcdMeasureString(const char *str) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void lcdLineBreak() {
|
void lcdLineBreak() {
|
||||||
// x=0 seems too much on the edge. So I keep it at 3
|
cx = cursor_x;
|
||||||
cx = 3;
|
|
||||||
cy += lcdGetCurFontHeight();
|
cy += lcdGetCurFontHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user