Commit 11c1032aa4e8cb16a7b1c84ee355d884d31f6f0f
1 parent
d647a41c
Changes after touch consumed behaviour change
Change-Id: I7ee6b895d7f7fbdb336a5c49c7eebac1ffb42c55
Showing
2 changed files
with
3 additions
and
3 deletions
examples/gestures/gesture-example.cpp
examples/text-field/text-field-example.cpp
| ... | ... | @@ -154,7 +154,7 @@ public: |
| 154 | 154 | bool OnPopupTouched( Actor actor, const TouchData& event ) |
| 155 | 155 | { |
| 156 | 156 | // End edit mode for TextField if parent Popup touched. |
| 157 | - if(event.GetPointCount() > 0) | |
| 157 | + if((event.GetPointCount() > 0) && (mPopup == event.GetHitActor(0))) | |
| 158 | 158 | { |
| 159 | 159 | switch( event.GetState( 0 ) ) |
| 160 | 160 | { |
| ... | ... | @@ -177,7 +177,7 @@ public: |
| 177 | 177 | } // end switch |
| 178 | 178 | } |
| 179 | 179 | |
| 180 | - return true; | |
| 180 | + return false; | |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | /** | ... | ... |