Removed close on click if button is enabled

DIPSAS · Feb 11, 2020 · abc6478 · abc6478
1 parent bc93a50
commit abc6478
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/DIPS.Xamarin.UI/Controls/FloatingActionMenu/FloatingActionMenuBehaviour.cs b/src/DIPS.Xamarin.UI/Controls/FloatingActionMenu/FloatingActionMenuBehaviour.cs
@@ -18,6 +18,7 @@ public class FloatingActionMenuBehaviour : Behavior<ModalityLayout>
             typeof(bool),
             typeof(Internal.Xaml.FloatingActionMenu),
             false,
+            BindingMode.TwoWay,
             propertyChanged: IsOpenPropertyChanged);
 
         /// <summary>

diff --git a/src/DIPS.Xamarin.UI/Controls/FloatingActionMenu/MenuButton.xaml.cs b/src/DIPS.Xamarin.UI/Controls/FloatingActionMenu/MenuButton.xaml.cs
@@ -226,12 +226,12 @@ public string Title
 
         private void MenuButton_OnClicked(object sender, EventArgs e)
         {
-            if (FloatingActionMenuParent != null)
+            if (FloatingActionMenuParent != null && !IsEnabled) 
             {
                 FloatingActionMenuParent.m_behaviour.IsOpen = false;
             }
 
-            if (Command != null && IsEnabled)
+            if (IsEnabled)
             {
                 Command?.Execute(CommandParameter);
             }

diff --git a/src/DIPS.Xamarin.UI/Internal/Xaml/FloatingActionMenu.xaml b/src/DIPS.Xamarin.UI/Internal/Xaml/FloatingActionMenu.xaml
@@ -8,7 +8,6 @@
              xmlns:ValueConverters="clr-namespace:DIPS.Xamarin.UI.Converters.ValueConverters"
              mc:Ignorable="d"
              x:Name="CodeBehind"
-             BackgroundColor="Blue"
              x:Class="DIPS.Xamarin.UI.Internal.Xaml.FloatingActionMenu">
 
     <ContentView.Content>