Diff: button_group.hpp

Revision:

4:543ec60c2814

Parent:

3:d99d9c0324b7

Child:

6:d268555e2f50

diff -r d99d9c0324b7 -r 543ec60c2814 button_group.hpp
--- a/button_group.hpp	Mon Nov 23 09:47:50 2015 +0000
+++ b/button_group.hpp	Sat Dec 05 11:09:29 2015 +0000
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------
 //  Button group class -- Header
 //
-//  2015/11/23, Copyright (c) 2015 MIKAMI, Naoki
+//  2015/12/05, Copyright (c) 2015 MIKAMI, Naoki
 //-----------------------------------------------------------
 
 #ifndef F746_BUTTON_GROUP_HPP
@@ -33,9 +33,16 @@
         void Draw(int num, uint32_t color, uint32_t textColor = LCD_COLOR_WHITE)
         {   buttons_[num]->Draw(color, textColor);  }
 
+        // Draw all button
+        void DrawAll(uint32_t color, uint32_t textColor = LCD_COLOR_WHITE)
+        {
+            for (int n=0; n<numberOfButtons_; n++)
+                buttons_[n]->Draw(color, textColor);
+        }
+
         // Redraw button with original color
         void Redraw(int num, uint32_t textColor = LCD_COLOR_WHITE)
-        {   buttons_[num]->Draw(buttons_[num]->GetColor(), textColor);   }
+        {   buttons_[num]->Draw(buttons_[num]->GetOriginalColor(), textColor);   }
 
         // Erase button with selected color
         void Erase(int num, uint32_t color)
@@ -54,6 +61,10 @@
 
         // Get touched number and redraw button if touched
         bool GetTouchedNumber(int &num, uint32_t color);
+        
+        // Get current color
+        uint32_t GetCurrentColor(int n)
+        {   return buttons_[n]->GetCurrentColor();  }
 
     private:
         Button **buttons_;