Fix TwoButtonPage issue on shell

Samsung · Mar 10, 2020 · e593a15 · e593a15
1 parent c1921ba
commit e593a15
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/Tizen.Wearable.CircularUI.Forms.Renderer/TizenCircleSurfaceEffect.cs b/src/Tizen.Wearable.CircularUI.Forms.Renderer/TizenCircleSurfaceEffect.cs
@@ -22,6 +22,7 @@
 using System.Text;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Tizen;
+using XForms = Xamarin.Forms.Forms;
 
 [assembly: ExportEffect(typeof(Tizen.Wearable.CircularUI.Forms.Renderer.TizenCircleSurfaceEffect), "CircleSurfaceEffect")]
 namespace Tizen.Wearable.CircularUI.Forms.Renderer
@@ -43,7 +44,15 @@ protected override void OnAttached()
         {
             var rect = Control.Geometry;
 
-            _surfaceLayout = new ElmSharp.Layout(Container);
+            if (Container != null)
+            {
+                _surfaceLayout = new ElmSharp.Layout(Container);
+            }
+            else
+            {
+                _surfaceLayout = new ElmSharp.Layout(XForms.NativeParent);
+            }
+
             _surfaceLayout.Show();
             _surface = new ElmSharp.Wearable.CircleSurface(_surfaceLayout);
             _surfaceLayout.Geometry = rect;