summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreduz <reduzio@gmail.com>2014-04-05 09:24:28 -0300
committerreduz <reduzio@gmail.com>2014-04-05 09:24:28 -0300
commit1f5457b2abf673939c5b69c0d75548b0fc30d5e5 (patch)
tree517c6017bfce1235ab6558ed7442fa1972109ae8
parent64671eb6fbed7df22af47dbf3cbbab427c2e00ab (diff)
parent4676aac33539adb78ed64c4645721dba041a749a (diff)
Merge pull request #243 from marynate/PR-fix-touchscreenbutton-released
Fix #240 TouchScreenButton release signal is not valid
-rw-r--r--doc/base/classes.xml2
-rw-r--r--scene/2d/screen_button.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/base/classes.xml b/doc/base/classes.xml
index 25278f2444..6e4d97c413 100644
--- a/doc/base/classes.xml
+++ b/doc/base/classes.xml
@@ -26402,7 +26402,7 @@
<description>
</description>
</signal>
- <signal name="release">
+ <signal name="released">
<description>
</description>
</signal>
diff --git a/scene/2d/screen_button.cpp b/scene/2d/screen_button.cpp
index 871c351479..32a5323419 100644
--- a/scene/2d/screen_button.cpp
+++ b/scene/2d/screen_button.cpp
@@ -357,7 +357,7 @@ void TouchScreenButton::_bind_methods() {
ADD_PROPERTY( PropertyInfo(Variant::INT,"visibility_mode",PROPERTY_HINT_ENUM,"Always,TouchScreen Only"),_SCS("set_visibility_mode"),_SCS("get_visibility_mode"));
ADD_SIGNAL( MethodInfo("pressed" ) );
- ADD_SIGNAL( MethodInfo("release" ) );
+ ADD_SIGNAL( MethodInfo("released" ) );