Merge pull request #112 from Jarod42/buttonHasMouse

Button has mouse
kallisti5 · Sep 27, 2024 · b3b2cbe · b3b2cbe
2 parents 2f197df + cd9241f
commit b3b2cbe
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 deletions.
diff --git a/include/guisan/widgets/button.hpp b/include/guisan/widgets/button.hpp
@@ -156,6 +156,7 @@ namespace gcn
 
         void mousePressed(MouseEvent& mouseEvent) override;
         void mouseReleased(MouseEvent& mouseEvent) override;
+        void mouseClicked(MouseEvent& mouseEvent) override;
         void mouseEntered(MouseEvent& mouseEvent) override;
         void mouseExited(MouseEvent& mouseEvent) override;
         void mouseDragged(MouseEvent& mouseEvent) override;

diff --git a/include/guisan/widgets/togglebutton.hpp b/include/guisan/widgets/togglebutton.hpp
@@ -112,7 +112,7 @@ namespace gcn
 
         // Inherited from MouseListener
 
-        void mouseReleased(MouseEvent& mouseEvent) override;
+        void mouseClicked(MouseEvent& mouseEvent) override;
 
         // Inherited from KeyListener
 

diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
@@ -198,13 +198,15 @@ namespace gcn
     {
         if (mMousePressed)
         {
-            return true;
+            return mHasMouse;
         }
         return mKeyPressed;
     }
 
     void Button::mousePressed(MouseEvent& mouseEvent)
     {
+        mHasMouse = gcn::Rectangle(0, 0, getWidth(), getHeight())
+                        .isContaining(mouseEvent.getX(), mouseEvent.getY());
         if (mouseEvent.isConsumed())
         {
             return;
@@ -228,16 +230,18 @@ namespace gcn
 
     void Button::mouseReleased(MouseEvent& mouseEvent)
     {
-        if (mouseEvent.getButton() == MouseEvent::Left
-            && mMousePressed)
+        if (mouseEvent.getButton() == MouseEvent::Left)
         {
             mMousePressed = false;
-            distributeActionEvent();
             mouseEvent.consume();
         }
-        else if (mouseEvent.getButton() == MouseEvent::Left)
+    }
+
+    void Button::mouseClicked(MouseEvent& mouseEvent)
+    {
+        if (mouseEvent.getButton() == MouseEvent::Left)
         {
-            mMousePressed = false;
+            distributeActionEvent();
             mouseEvent.consume();
         }
     }

diff --git a/src/widgets/togglebutton.cpp b/src/widgets/togglebutton.cpp
@@ -158,22 +158,14 @@ namespace gcn
         mSelected = selected;
     }
 
-    void ToggleButton::mouseReleased(MouseEvent& mouseEvent)
+    void ToggleButton::mouseClicked(MouseEvent& mouseEvent)
     {
-        if (mouseEvent.getButton() == MouseEvent::Left
-            && mMousePressed
-            && mHasMouse)
+        if (mouseEvent.getButton() == MouseEvent::Left)
         {
-            mMousePressed = false;
             toggleSelected();
             distributeActionEvent();
             mouseEvent.consume();
         }
-        else if (mouseEvent.getButton() == MouseEvent::Left)
-        {
-            mMousePressed = false;
-            mouseEvent.consume();
-        }
     }
 
     void ToggleButton::keyReleased(KeyEvent& keyEvent)