Diff: Graphics/GraphicsDisplay.cpp

Revision:

8:26757296c79d

Parent:

4:12ba0ecc2c1f

Child:

16:244f9563ebc1

--- a/Graphics/GraphicsDisplay.cpp	Tue Feb 17 11:02:06 2015 +0000
+++ b/Graphics/GraphicsDisplay.cpp	Tue Feb 17 17:54:14 2015 +0000
@@ -25,7 +25,7 @@
 #include "GraphicsDisplay.h"
 #define SWAP(a, b)  { a ^= b; b ^= a; a ^= b; }
 GraphicsDisplay::GraphicsDisplay(const char *name):TextDisplay(name) {
-    set_font((unsigned char*)Terminal6x8);
+    set_font((unsigned char*)Terminal6x8,32,127,true);
  //   foreground(0xFFFF);
  //   background(0x0000);
     char_x = 0;
@@ -299,8 +299,12 @@
             }
         }
     }
-    if(fontprop) char_x += w;
-    else char_x += fonthor;
+    if(fontprop)
+    {
+        if((w+1)<fonthor) char_x += w+1; // put at least 1 blank after variable-width characters, except characters that occupy whole fonthor space like "_"
+        else char_x += fonthor;
+    }
+    else char_x += fonthor; // fixed width
 }
 void GraphicsDisplay::Bitmap_BW(Bitmap_s bm, int x, int y)
 {