add clicked and active function in button

1 files changed, 15 insertions, 9 deletions

diff --git a/src/api/Button.py b/src/api/Button.py
index 04b4515..abe5863 100755
--- a/src/api/Button.py
+++ b/src/api/Button.py
@@ -8,26 +8,32 @@ import Mouse
 class CButton(CLabel):

     """ a button based on the label 

         same properties as label +

-        active: True if user is clicking on sprite

+        mactive: True if user is clicking on sprite

                 False if user is not currently clicking

-        clicked: True when user releases mouse over a 

+        mclicked: True when user releases mouse over a 

                  currently active button

     """

 

     def __init__(self):

         CLabel.__init__(self)

-        self.active = False

-        self.clicked = False

+        self.mactive = False

+        self.mclicked = False

         self.bgColor = (0xCC, 0xCC, 0xCC)

         self.set_text('Button')

         

     def setCenter(self, aCenter):

         self.set_center(aCenter)

     

+    def clicked(self):

+        return self.mclicked

+    

+    def active(self):

+        return self.mactive

+    

     def update(self):

         CLabel.update(self)

         

-        self.clicked = False

+        self.mclicked = False

 

         #TODO: Make a CMouse class and check for isPressed() and click().

 

@@ -35,11 +41,11 @@ class CButton(CLabel):
         

         if Mouse.get_pressed() == (1, 0, 0):

             if self.rect.collidepoint(Mouse.get_position()):

-                self.active = True

+                self.mactive = True

 

         #check for mouse release

-        if self.active == True:

+        if self.mactive == True:

             if Mouse.get_pressed() == (0, 0, 0):

-                self.active = False

+                self.mactive = False

                 if self.rect.collidepoint(Mouse.get_position()):

-                    self.clicked = True

+                    self.mclicked = True