better text

TakefiveInteractive · Dec 10, 2015 · e8b18a1 · e8b18a1
1 parent bed4f3f
commit e8b18a1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/mp3/student-distrib/inc/ui/compositor.h b/mp3/student-distrib/inc/ui/compositor.h
@@ -96,20 +96,15 @@ class Compositor : public KeyB::IEvent {
         void drawSingle(const Container *d, const Rectangle &rect);
         void drawSingle(const Container *d, const Rectangle &rect, const Rectangle &difference);
 
-        void addText(int txtX, int txtY, char c);
+        Drawable* addText(int txtX, int txtY, char c);
 
         Container *getElementAtPosition(int absX, int absY);
 
         // Unit: text font width
         int32_t txtX = 0;
 
     public:
-        virtual void key(uint32_t kkc, bool capslock)
-        {
-            if(kkc &(~KKC_ASCII_MASK))
-                return;
-            addText(txtX++, 0, (char)kkc);
-        }
+        virtual void key(uint32_t kkc, bool capslock);
 
         // Down and Up cuts changes to ONE single key at a time.
         virtual void keyDown(uint32_t kkc, bool capslock)

diff --git a/mp3/student-distrib/ui/compositor.cpp b/mp3/student-distrib/ui/compositor.cpp
@@ -225,7 +225,7 @@ static uint8_t *renderRGBAFont(ArrFile &parser, int width, int height, char c)
 }
 
 
-void Compositor::addText(int txtX, int txtY, char c)
+Drawable* Compositor::addText(int txtX, int txtY, char c)
 {
     constexpr int NumFont = 94;
     constexpr int FontWidth = 20;
@@ -246,6 +246,8 @@ void Compositor::addText(int txtX, int txtY, char c)
     theDispatcher->close(fontFile);
     rootContainer->addChild(draw);
     draw->show();
+
+    return draw;
 }
 
 void Compositor::drawNikita()
@@ -288,6 +290,21 @@ void Compositor::enterTextMode()
     });
 }
 
+void Compositor::key(uint32_t kkc, bool capslock)
+{
+    if(kkc &(~KKC_ASCII_MASK))
+        return;
+    static Drawable* all[10] = {0};
+    all[txtX] = addText(txtX++, 0, (char)kkc);
+    if(txtX >= 10)
+    {
+    txtX = 0;
+    for(int i=0; i<10; i++)
+        (all[i])->hide();
+    }
+
+}
+
 
 // SYSCALLS