diff options
author | David Steele <david.steele@samsung.com> | 2017-09-25 10:15:42 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal> | 2017-09-25 10:15:43 +0000 |
commit | 59a2a370611b0512e90545b6e5c5a7eadc7d3c98 (patch) | |
tree | 722bcf993904c72f2b792c983b6b2225e7507bf6 /Tizen.NUI/src/public/BaseComponents | |
parent | 0aa214f9a80da264a9872c8f23f2362ccde73edd (diff) | |
parent | 17b031d7b84c77deadea1a63325c2ad7828cb0ee (diff) | |
download | nui-59a2a370611b0512e90545b6e5c5a7eadc7d3c98.tar.gz nui-59a2a370611b0512e90545b6e5c5a7eadc7d3c98.tar.bz2 nui-59a2a370611b0512e90545b6e5c5a7eadc7d3c98.zip |
Merge "Oring key event callback result" into devel/master
Diffstat (limited to 'Tizen.NUI/src/public/BaseComponents')
-rwxr-xr-x | Tizen.NUI/src/public/BaseComponents/View.cs | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Tizen.NUI/src/public/BaseComponents/View.cs b/Tizen.NUI/src/public/BaseComponents/View.cs index b269e05..0b322a8 100755 --- a/Tizen.NUI/src/public/BaseComponents/View.cs +++ b/Tizen.NUI/src/public/BaseComponents/View.cs @@ -376,15 +376,23 @@ namespace Tizen.NUI.BaseComponents { KeyEventArgs e = new KeyEventArgs(); + bool result = false; + e.Key = Tizen.NUI.Key.GetKeyFromPtr(keyEvent); if (_keyEventHandler != null) { - return _keyEventHandler(this, e); + Delegate[] delegateList = _keyEventHandler.GetInvocationList(); + + // Oring the result of each callback. + foreach ( EventHandlerWithReturnType<object, KeyEventArgs, bool> del in delegateList ) + { + result |= del( this, e ); + } } - return false; - } + return result; + } private EventHandler _onRelayoutEventHandler; [UnmanagedFunctionPointer(CallingConvention.StdCall)] |