piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[X9D] Midsize font: numbers are narrowed

Browse Source
This commit is contained in:
bsongis
2012-11-28 21:56:01 +00:00
parent ab1fcd9997
commit 814452ee35
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lcd.cpp
+7 -7
View File
@@ -328,7 +328,7 @@ void lcd_outdezNAtt(xcoord_t x, uint8_t y, int16_t val, LcdFlags flags, uint8_t
}
else if (midsize) {
flags |= CONDENSED;
fw += FWNUM-2;
fw += FWNUM-3;
}
else {
if (flags & LEFT) {
@@ -367,8 +367,8 @@ void lcd_outdezNAtt(xcoord_t x, uint8_t y, int16_t val, LcdFlags flags, uint8_t
}
}
else if (midsize) {
x -= 2;
xn = x;
x -= 3;
xn = x+1;
}
else {
x--;
@@ -557,9 +557,9 @@ void putsTime(xcoord_t x, uint8_t y, putstime_t tme, LcdFlags att, LcdFlags att2
#if defined(PCBX9D)
if (att & MIDSIZE) {
div_t qr2 = div(qr.quot, 60);
LCD_2DOTS(x+2*8-5, y, att);
LCD_2DOTS(x+2*8-6, y, att);
lcd_outdezNAtt(x, y, qr2.quot, att|LEADING0|LEFT, 2);
x += 2*8+2;
x += 2*8+1;
}
#define separator ':'
#elif defined(PCBSKY9X)
@@ -578,8 +578,8 @@ void putsTime(xcoord_t x, uint8_t y, putstime_t tme, LcdFlags att, LcdFlags att2
x3 = x+2*(FW+FWNUM)+FW-2;
}
else if (att&MIDSIZE) {
x2 = x+2*8-5;
x3 = x+2*8+2;
x2 = x+2*8-6;
x3 = x+2*8+1;
}
else {
x2 = x+2*FWNUM-1;
src/main_views.cpp
+3 -3
View File
@@ -48,7 +48,7 @@
#define BITMAP_Y (DISPLAY_H/2)
#define PHASE_X BITMAP_X
#define PHASE_Y (3*FH)
#define TIMERS_X 141
#define TIMERS_X 144
#define TIMERS_R 192
#define REBOOT_X (DISPLAY_W-FW)
#define VSWITCH_X(i) ((i >= NUM_CSW/2 ? BITMAP_X+26 : 19) + 3*i)
@@ -275,7 +275,7 @@ void menuMainView(uint8_t event)
lcd_hline(TIMERS_X-6, 2, 4);
// lcd_hline(TIMERS_X-6, 3, 4);
if (BLINK_ON_PHASE)
lcd_filled_rect(TIMERS_X-17, 0, 72, 12);
lcd_filled_rect(TIMERS_X-17, 0, 69, 12);
}
}
@@ -288,7 +288,7 @@ void menuMainView(uint8_t event)
lcd_hline(TIMERS_X-6, FH+5, 4);
// lcd_hline(TIMERS_X-6, FH+6, 4);
if (BLINK_ON_PHASE)
lcd_filled_rect(TIMERS_X-17, FH+3, 72, 12);
lcd_filled_rect(TIMERS_X-17, FH+3, 69, 12);
}
}
#else