[NUI] Use FocusChanged in BorderWindow because it fixed an issue with Emulator's...
authorjoogab.yun <joogab.yun@samsung.com>
Tue, 23 Aug 2022 04:34:00 +0000 (13:34 +0900)
committerSangHyeon Jade Lee <dltkdgus1764@gmail.com>
Tue, 30 Aug 2022 07:41:27 +0000 (16:41 +0900)
refer https://github.com/Samsung/TizenFX/pull/4498

src/Tizen.NUI/src/public/Window/BorderWindow.cs

index 0369b76..87a0f2a 100755 (executable)
@@ -276,9 +276,7 @@ namespace Tizen.NUI
                 // Add a view to the border layer.
                 GetBorderWindowBottomLayer().Add(rootView);
 
                 // Add a view to the border layer.
                 GetBorderWindowBottomLayer().Add(rootView);
 
-                // TODO after the emulator issue is resolved, use the FocusChanged event.
-                //FocusChanged += OnWindowFocusChanged;
-                InterceptTouchEvent += OnWindowInterceptTouched;
+                FocusChanged += OnWindowFocusChanged;
 
                 return true;
             }
 
                 return true;
             }
@@ -289,26 +287,15 @@ namespace Tizen.NUI
             }
         }
 
             }
         }
 
-        private bool OnWindowInterceptTouched(object sender, Window.TouchEventArgs e)
+        private void OnWindowFocusChanged(object sender, Window.FocusChangedEventArgs e)
         {
         {
-            if (e.Touch.GetState(0) == PointStateType.Down && IsMaximized() == false)
+            if (e.FocusGained == true && IsMaximized() == false)
             {
                 // Raises the window when the window is focused.
                 Raise();
             }
             {
                 // Raises the window when the window is focused.
                 Raise();
             }
-            return false;
         }
 
         }
 
-        // TODO after the emulator issue is resolved, use the FocusChanged event.
-        // private void OnWindowFocusChanged(object sender, Window.FocusChangedEventArgs e)
-        // {
-        //     if (e.FocusGained == true && IsMaximized() == false)
-        //     {
-        //         // Raises the window when the window is focused.
-        //         Raise();
-        //     }
-        // }
-
         /// Create the border UI.
         private bool CreateBorder()
         {
         /// Create the border UI.
         private bool CreateBorder()
         {
@@ -541,7 +528,7 @@ namespace Tizen.NUI
         internal void DisposeBorder()
         {
             Resized -= OnBorderWindowResized;
         internal void DisposeBorder()
         {
             Resized -= OnBorderWindowResized;
-            InterceptTouchEvent -= OnWindowInterceptTouched;
+            FocusChanged -= OnWindowFocusChanged;
             borderInterface.Dispose();
             GetBorderWindowBottomLayer().Dispose();
         }
             borderInterface.Dispose();
             GetBorderWindowBottomLayer().Dispose();
         }