added button enable/disable

adafruit · Oct 26, 2023 · 5d22d2c · 5d22d2c
1 parent 9fbafe4
commit 5d22d2c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/Adafruit_GFX.cpp b/Adafruit_GFX.cpp
@@ -1742,6 +1742,20 @@ void Adafruit_GFX_Button::setLabel(char *label) {
    @return  button label char pointer
 */
 char *Adafruit_GFX_Button::getLabel() { return _label; }
+
+/**********************************************************************/
+/*!
+    @brief    Set the button to enable/disable
+    @param    enable boolean true to enable, false to disable
+	@param    fillColor uint16_t set button fillColor
+*/
+/**********************************************************************/
+  void Adafruit_GFX_Button::setEnabled(bool enable, uint16_t fillColor) {
+	_enabled = enable;
+	_fillcolor = fillColor;
+	drawButton();
+}
+
 // -------------------------------------------------------------------------
 
 // GFXcanvas1, GFXcanvas8 and GFXcanvas16 (currently a WIP, don't get too

diff --git a/Adafruit_GFX.h b/Adafruit_GFX.h
@@ -282,7 +282,7 @@ class Adafruit_GFX_Button {
   /**********************************************************************/
   void press(bool p) {
     laststate = currstate;
-    currstate = p;
+    currstate = p & _enabled;
   }
 
   bool justPressed();
@@ -294,8 +294,18 @@ class Adafruit_GFX_Button {
     @returns  True if pressed
   */
   /**********************************************************************/
-  bool isPressed(void) { return currstate; };
+  bool isPressed(void) { return currstate; };  
+
+ /**********************************************************************/
+  /*!
+    @brief    Check whether the button is enabled
+    @returns  True if enabled
+  */
+  /**********************************************************************/
+  bool isEnabled(void) { return _enabled; }
 
+  void setEnabled(bool enable, uint16_t fillColor);
+
 private:
   Adafruit_GFX *_gfx;
   int16_t _x1, _y1; // Coordinates of top-left corner
@@ -305,7 +315,7 @@ class Adafruit_GFX_Button {
   uint16_t _outlinecolor, _fillcolor, _textcolor;
   char _label[10];
 
-  bool currstate, laststate;
+  bool currstate, laststate, _enabled = true;
 };
 
 /// A GFX 1-bit canvas context for graphics