uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Revert "very dirty fix"

Browse source 
This reverts commit 0a31b48c5a.
This commit is contained in:
Tectu 2012-06-20 15:37:25 +02:00
parent 0a31b48c5a
commit 83f22aaeb6
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
glcd.c
View file

@ -73,7 +73,6 @@ 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;
@ -273,7 +272,6 @@ 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;
@ -319,7 +317,8 @@ uint16_t lcdMeasureString(const char *str) {
} }
void lcdLineBreak() { void lcdLineBreak() {
cx = cursor_x; // x=0 seems too much on the edge. So I keep it at 3
cx = 3;
cy += lcdGetCurFontHeight(); cy += lcdGetCurFontHeight();
} }