Neil Thiessen / NeatGUI

A simple yet powerful library for controlling graphical displays. Multiple display controllers are supported using inheritance.

Dependents:   mbed_rifletool Hexi_Bubble_Game Hexi_Catch-the-dot_Game Hexi_Acceleromagnetic_Synth

NOTE: This library is in beta right now. As far as I know, everything here works, but there are many features that are lacking so far. Most notably containers, button handling, and display drivers other than the SSD1306.

Files at this revision

API Documentation at this revision

Revision 3:a8f72d4864e6, committed 2014-05-27

Comitter:
neilt6
Date:
Tue May 27 21:41:28 2014 +0000
Parent:
2:bbfc18022ee5
Commit message:
Syntax improvements

Changed in this revision

Controls/Label.cpp Show annotated file Show diff for this revision Revisions of this file
Controls/ProgressBar.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/Controls/Label.cpp	Tue May 27 20:05:29 2014 +0000
+++ b/Controls/Label.cpp	Tue May 27 21:41:28 2014 +0000
@@ -18,10 +18,8 @@
 
 Label::Label(int x, int y, int w, int h, Font *fnt) : Control(x, y, w, h)
 {
-    m_Text = NULL;
-    m_Font = fnt;
-    border(1);
-    padding(1);
+    text(NULL);
+    font(fnt);
     foreColor(0xFFFFFFFF);
     backColor(0xFF000000);
 }
@@ -32,6 +30,6 @@
     Control::paint(canvas);
 
     //Draw the text if there is any
-    if (m_Text != NULL && m_Font != NULL)
-        canvas->drawString(m_Text, m_Font, contentPosX(), contentPosY(), contentWidth(), contentHeight());
+    if (text() != NULL && font() != NULL)
+        canvas->drawString(text(), font(), contentPosX(), contentPosY(), contentWidth(), contentHeight());
 }

--- a/Controls/ProgressBar.cpp	Tue May 27 20:05:29 2014 +0000
+++ b/Controls/ProgressBar.cpp	Tue May 27 21:41:28 2014 +0000
@@ -19,8 +19,8 @@
 ProgressBar::ProgressBar(int x, int y, int w, int h, Font *fnt) : Control(x, y, w, h)
 {
     m_Value = 0.0;
-    m_Text = NULL;
-    m_Font = fnt;
+    text(NULL);
+    font(fnt);
     border(1);
     padding(1);
     foreColor(0xFFFFFFFF);
@@ -42,20 +42,16 @@
         m_Value = 100;
     else
         m_Value = v;
-    
+
     //Force a repaint
-    m_Invalid = true;
+    invalidate();
 }
 
 void ProgressBar::paint(Canvas* canvas)
 {
     //Paint the base class
     Control::paint(canvas);
-    
+
     //Draw the progress bar
     canvas->fillRect(contentPosX(), contentPosY(), contentWidth() * m_Value, contentHeight(), foreColor());
-
-    //Draw the text if there is any
-    /*if (m_Text != NULL && m_Font != NULL)
-        canvas->drawString(m_Text, m_Font, contentPosX(), contentPosY(), contentWidth(), contentHeight());*/
 }