瀏覽代碼

Merge pull request #588 from marynate/PR-fix-touchscreenbutton-input

Fixed touchscreen was processing input in editor
Juan Linietsky 11 年之前
父節點
當前提交
f304c9f93a
共有 1 個文件被更改,包括 6 次插入2 次删除
  1. 6 2
      scene/2d/screen_button.cpp

+ 6 - 2
scene/2d/screen_button.cpp

@@ -92,7 +92,10 @@ void TouchScreenButton::_notification(int p_what) {
 			if (!get_scene()->is_editor_hint() && !OS::get_singleton()->has_touchscreen_ui_hint() && visibility==VISIBILITY_TOUCHSCREEN_ONLY)
 				return;
 			update();
-			set_process_input(true);
+
+			if (!get_scene()->is_editor_hint())
+				set_process_input(true);
+
 			if (action.operator String()!="" && InputMap::get_singleton()->has_action(action)) {
 				action_id=InputMap::get_singleton()->get_action_id(action);
 			} else {
@@ -170,7 +173,8 @@ void TouchScreenButton::_input(const InputEvent& p_event) {
 					}
 				} else {
 
-					touched=Rect2(Point2(),texture->get_size()).has_point(coord);
+					if (texture.is_valid())
+						touched=Rect2(Point2(),texture->get_size()).has_point(coord);
 				}