Fix FloatingButton

Change-Id: I90e27407b063e36e2c9f5e463754f7062d2f9276

diff --git a/Tizen.Xamarin.Forms.Extension.Renderer/FloatingButtonImplementation.cs b/Tizen.Xamarin.Forms.Extension.Renderer/FloatingButtonImplementation.cs
index 76fb55b..abcde28 100644 (file)
--- a/Tizen.Xamarin.Forms.Extension.Renderer/FloatingButtonImplementation.cs
+++ b/Tizen.Xamarin.Forms.Extension.Renderer/FloatingButtonImplementation.cs
@@ -24,7 +24,6 @@ namespace Tizen.Xamarin.Forms.Extension
     {
         EFloatingButton _control = null;
         FloatingButtonMovablePosition _movablePosition = FloatingButtonMovablePosition.All;
-        FloatingButtonPosition _position = FloatingButtonPosition.Right;
         bool _isShown = true;
         FloatingButtonItem _firstButton = null;
         FloatingButtonItem _secondButton = null;
@@ -39,6 +38,10 @@ namespace Tizen.Xamarin.Forms.Extension
                 Mode = FloatingButtonMode.All,
                 MinimumHeight = 100,
                 MinimumWidth = 100,
+                AlignmentY = -1,
+                AlignmentX = -1,
+                WeightX = 1,
+                WeightY = 1,
             };
             UpdateLocation();
             TForms.Context.MainWindow.RotationChanged += (s, e) => { UpdateLocation(); };
@@ -61,7 +64,7 @@ namespace Tizen.Xamarin.Forms.Extension
 
         public FloatingButtonPosition Position
         {
-            get { return _position; }
+            get { return (FloatingButtonPosition)_control.Position; }
         }
 
         public bool IsShown
@@ -93,7 +96,6 @@ namespace Tizen.Xamarin.Forms.Extension
         {
             if (_movablePosition != FloatingButtonMovablePosition.None)
             {
-                _position = (FloatingButtonPosition)position;
                 UpdatePosition(animated);
             }
         }

diff --git a/Tizen.Xamarin.Forms.Extension/FloatingButton.cs b/Tizen.Xamarin.Forms.Extension/FloatingButton.cs
index ebaf8ab..88b21a1 100644 (file)
--- a/Tizen.Xamarin.Forms.Extension/FloatingButton.cs
+++ b/Tizen.Xamarin.Forms.Extension/FloatingButton.cs
@@ -35,8 +35,6 @@ namespace Tizen.Xamarin.Forms.Extension
     {
         public static readonly BindableProperty MovablePositionProperty = BindableProperty.Create(nameof(MovablePosition), typeof(FloatingButtonMovablePosition), typeof(FloatingButton), FloatingButtonMovablePosition.All);
 
-        public static readonly BindableProperty PositionProperty = BindableProperty.Create(nameof(Position), typeof(FloatingButtonPosition), typeof(FloatingButton), FloatingButtonPosition.Right);
-
         public static readonly BindableProperty IsShownProperty = BindableProperty.Create(nameof(IsShown), typeof(bool), typeof(FloatingButton), true);
 
         public static readonly BindableProperty FirstButtonProperty = BindableProperty.Create(nameof(FirstButton), typeof(FloatingButtonItem), typeof(FloatingButton), null);
@@ -59,7 +57,7 @@ namespace Tizen.Xamarin.Forms.Extension
         /// </summary>
         public FloatingButtonPosition Position
         {
-            get { return (FloatingButtonPosition)GetValue(PositionProperty); }
+            get { return _floatingButton.Position; }
         }
 
         /// <summary>
@@ -131,7 +129,6 @@ namespace Tizen.Xamarin.Forms.Extension
                 throw new Exception("Object reference not set to an instance of a FloatingButton.");
 
             SetBinding(MovablePositionProperty, new Binding(nameof(MovablePosition), mode: BindingMode.TwoWay, source: _floatingButton));
-            SetBinding(PositionProperty, new Binding(nameof(Position), mode: BindingMode.TwoWay, source: _floatingButton));
             SetBinding(FirstButtonProperty, new Binding(nameof(FirstButton), mode: BindingMode.TwoWay, source: _floatingButton));
             SetBinding(SecondButtonProperty, new Binding(nameof(SecondButton), mode: BindingMode.TwoWay, source: _floatingButton));
         }