Fixing popup

Signed-off-by: k.stepaniuk <k.stepaniuk@samsung.com>

diff --git a/Oobe/Oobe.Common/Utils/Popup.cs b/Oobe/Oobe.Common/Utils/Popup.cs
index 4189ee382ca8f88298e98c20bf7273b107086f7b..ee103b767b4d07be14ed9e891e13a1c02bb0d118 100644 (file)
--- a/Oobe/Oobe.Common/Utils/Popup.cs
+++ b/Oobe/Oobe.Common/Utils/Popup.cs
@@ -1,16 +1,20 @@
-using System;
-using Tizen.NUI;
+using Tizen.NUI;
 using Tizen.NUI.BaseComponents;
-
+using Tizen.NUI.Components;\r
+\r
 namespace Oobe.Common.Utils
 {
     public class Popup
     {
         private View view;
         private Layer layer = null;
+        private bool dismissible; //can be dissmissed when clicked outside
+        private float backgroundOpacity;\r
 
-        public Popup(View view, bool centered = false)
+        public Popup(View view, float backgroundOpacity = 0.1f, bool dismissible = false, bool centered = false)
         {
+            this.dismissible = dismissible;\r
+            this.backgroundOpacity = backgroundOpacity;\r
             this.view = view;
             if (centered)
             {
@@ -54,25 +58,32 @@ namespace Oobe.Common.Utils
         {
             Dismiss();
             layer = new Layer();
+            layer.Add(CreateGray());
+            layer.Add(view);
+            view.TouchEvent += (s, e) => false; //prevent gray view reacting\r
+            Window.Instance.AddLayer(layer);
+        }\r
+\r
+        private Control CreateGray()\r
+        {\r
             var gray = new Tizen.NUI.Components.Control()
             {
                 WidthResizePolicy = ResizePolicyType.FillToParent,
                 HeightResizePolicy = ResizePolicyType.FillToParent,
-                BackgroundColor = new Color(0f, 0f, 0f, 0.1f),
-            };
-            gray.TouchEvent += (s, e) =>
-            {
-                if (e.Touch.GetState(0) == PointStateType.Up)
-                {
-                    Dismiss();
-                }
-                return true;
+                BackgroundColor = new Color(0f, 0f, 0f, backgroundOpacity),
             };
-            layer.Add(gray);
-
-            view.TouchEvent += (s, e) => false; //prevent gray view reacting
-            layer.Add(view);
-            Window.Instance.AddLayer(layer);
-        }
+            if (dismissible)\r
+            {\r
+                gray.TouchEvent += (s, e) =>\r
+                {\r
+                    if (e.Touch.GetState(0) == PointStateType.Up)\r
+                    {\r
+                        Dismiss();\r
+                    }\r
+                    return true;\r
+                };\r
+            }\r
+            return gray;\r
+        }\r
     }
 }

diff --git a/Oobe/Oobe.Wifi/Controls/Wifi/AddNewNetworkPupup.cs b/Oobe/Oobe.Wifi/Controls/Wifi/AddNewNetworkPupup.cs
index fa24fc414a9fae90416c881732e83ae30dc17df0..5704dd9fbe42ec134c0c2a362b99c46974b48017 100644 (file)
--- a/Oobe/Oobe.Wifi/Controls/Wifi/AddNewNetworkPupup.cs
+++ b/Oobe/Oobe.Wifi/Controls/Wifi/AddNewNetworkPupup.cs
@@ -292,7 +292,7 @@ namespace Oobe.Wifi.Controls.Wifi
         void OpenSecurityTypePopup()
         {
             var view = new ChangeSecurityTypePopup(currentSecurityType);
-            var popup = new Oobe.Common.Utils.Popup(view);
+            var popup = new Oobe.Common.Utils.Popup(view, backgroundOpacity: 0f);
             view.OnDismiss += () =>
             {
                 ResetViewTo(view.WifiUISecurityType);