From: Jerome St-Louis <jerome@ecere.com>
Date: Sat, 7 Feb 2015 03:22:57 +0000 (-0500)
Subject: ecere/gui/Window: Call OnMouseLeave on Release for Android
X-Git-Tag: 0.44.11~6
X-Git-Url: https://ecere.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a087924c7700e5984dab5fd23e4afad7eefd95d;hp=edff89620f620bb5598dffaa2c200f3d222a5b99;p=sdk

ecere/gui/Window: Call OnMouseLeave on Release for Android
---

diff --git a/ecere/src/gui/Window.ec b/ecere/src/gui/Window.ec
index ee0c553..826d43c 100644
--- a/ecere/src/gui/Window.ec
+++ b/ecere/src/gui/Window.ec
@@ -4373,6 +4373,11 @@ private:
                incref window;
                if(!MouseMethod(window, clientX, clientY, *mods))
                   result = false;
+
+#ifdef __ANDROID__
+               if(method == __ecereVMethodID___ecereNameSpace__ecere__gui__Window_OnLeftButtonUp)
+                  window.OnMouseLeave(*mods);
+#endif
                delete window;
             }
          }
diff --git a/ecere/src/gui/controls/Button.ec b/ecere/src/gui/controls/Button.ec
index a4983df..6d0f029 100644
--- a/ecere/src/gui/controls/Button.ec
+++ b/ecere/src/gui/controls/Button.ec
@@ -560,6 +560,7 @@ public class Button : CommonControl
 
    bool OnLeftButtonUp(int x, int y, Modifiers mods)
    {
+      bool result = true;
       if(!(buttonStyle.toggle))
       {
          bool releasedResult;
@@ -586,10 +587,8 @@ public class Button : CommonControl
                Update(null);
                if(releasedResult)
                {
-                  if(NotifyClicked(master, this, x,y, mods))
-                     return true;
-                  else
-                     return false;
+                  if(!NotifyClicked(master, this, x,y, mods))
+                     result = false;
                }
             }
             else
@@ -600,7 +599,7 @@ public class Button : CommonControl
             }
          }
       }
-      return true;
+      return result;
    }
 
    bool OnLeftDoubleClick(int x, int y, Modifiers mods)