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 (file)
--- 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 (file)
--- 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)