From c67de60c720dc58abb325f1ea026ad107dcf3788 Mon Sep 17 00:00:00 2001
From: Nora Ky <kynora168@gmail.com>
Date: Thu, 26 Apr 2018 12:41:04 +0700
Subject: [PATCH] Fix touch screen on Canvas and popLayer method.

---
 engine/source/gui/guiCanvas.cc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/engine/source/gui/guiCanvas.cc b/engine/source/gui/guiCanvas.cc
index 9cf7dc8a4..d4d52547b 100755
--- a/engine/source/gui/guiCanvas.cc
+++ b/engine/source/gui/guiCanvas.cc
@@ -233,7 +233,7 @@ void GuiCanvas::processScreenTouchEvent(const ScreenTouchEvent *event)
         mLastMouseDownTime = curTime;
 //		mLastEvent.mouseClickCount = mLastMouseClickCount;
         
-        rootScreenTouchDown(mLastEvent);
+        rootMouseDown(mLastEvent);
     }
     else if(event->action == SI_MOVE)
     {
@@ -243,7 +243,7 @@ void GuiCanvas::processScreenTouchEvent(const ScreenTouchEvent *event)
     else if(event->action == SI_BREAK)
     {
         mNextMouseTime = 0xFFFFFFFF;
-        rootScreenTouchUp(mLastEvent);
+        rootMouseUp(mLastEvent);
     }
 }
 
@@ -1095,10 +1095,8 @@ void GuiCanvas::popDialogControl(S32 layer)
       i--;
       ctrl = static_cast<GuiControl*>(*i);
       if (ctrl->mLayer == layer)
-         break;
+			popDialogControl(ctrl);
    }
-   if (ctrl)
-      popDialogControl(ctrl);
 }
 
 void GuiCanvas::mouseLock(GuiControl *lockingControl)