From 868ba093ec2de878aba4429e5e69157ca696b5eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=8A=B9=EA=B7=BC/Common=20Platform=20Lab=28SR?= =?UTF-8?q?=29/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Tue, 12 Jul 2022 14:08:56 +0900 Subject: [PATCH] [NUI] Fix ImageButton Clicked (#523) * Fix ImageButton Clicked * Apply review comment --- src/Core/src/Platform/Tizen/MauiImageButton.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Core/src/Platform/Tizen/MauiImageButton.cs b/src/Core/src/Platform/Tizen/MauiImageButton.cs index 65ed5c166027..28384f39b813 100644 --- a/src/Core/src/Platform/Tizen/MauiImageButton.cs +++ b/src/Core/src/Platform/Tizen/MauiImageButton.cs @@ -1,5 +1,6 @@ using System; using Tizen.NUI; +using Tizen.UIExtensions.NUI; using NColor = Tizen.NUI.Color; using TImage = Tizen.UIExtensions.NUI.Image; @@ -16,6 +17,7 @@ public class MauiImageButton : TImage public MauiImageButton() { TouchEvent += OnTouched; + KeyEvent += OnKeyEvent; Border = Border = new Rectangle(0, 0, 0, 0); } @@ -48,7 +50,7 @@ bool OnTouched(object source, TouchEventArgs e) else if (state == PointStateType.Up) { Released?.Invoke(this, EventArgs.Empty); - if (_isPressed) + if (_isPressed && this.IsInside(e.Touch.GetLocalPosition(0))) { Clicked?.Invoke(this, EventArgs.Empty); } @@ -57,5 +59,15 @@ bool OnTouched(object source, TouchEventArgs e) } return false; } + + bool OnKeyEvent(object source, KeyEventArgs e) + { + if (e.Key.IsAcceptKeyEvent()) + { + Clicked?.Invoke(this, EventArgs.Empty); + return true; + } + return false; + } } } \ No newline at end of file