floating action polish

Author: ButchersBoy

MainDemo.Wpf/Buttons.xaml

@@ -13,6 +13,7 @@
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Button.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.CheckBox.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ListBox.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.PopupBox.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.RadioButton.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ToggleButton.xaml" />
             </ResourceDictionary.MergedDictionaries>
@@ -106,6 +107,16 @@
                     </Canvas>
                 </Viewbox>
             </Button>
+            <materialDesign:PopupBox Style="{StaticResource MaterialDesignMultiFloatingActionPopupBox}"
+                                     PlacementMode="BottomAndAlignCentres"
+                                     ToolTipService.Placement="Right"
+                                     ToolTip="PopupBox, Style MaterialDesignMultiFloatingActionPopupBox">
+                <StackPanel>
+                    <Button ToolTip="One">1</Button>
+                    <Button ToolTip="Two">2</Button>
+                    <Button ToolTip="Three">3</Button>
+                </StackPanel>
+            </materialDesign:PopupBox>
         </StackPanel>
         <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="0 16 0 0">
             <Button Style="{StaticResource MaterialDesignRaisedLightButton}" Margin="0 0 8 0" Width="100"

MaterialDesignThemes.Wpf/PopupBox.cs

@@ -70,6 +70,7 @@ public enum PopupBoxPopupMode
     /// </summary>
     [TemplatePart(Name = PopupPartName, Type = typeof(Popup))]
     [TemplatePart(Name = PopupContentControlPartName, Type = typeof(ContentControl))]
+    [TemplatePart(Name = TogglePartName, Type = typeof(ToggleButton))]
     [TemplateVisualState(GroupName = "PopupStates", Name = PopupIsOpenStateName)]
     [TemplateVisualState(GroupName = "PopupStates", Name = PopupIsClosedStateName)]
     [ContentProperty("PopupContent")]
@@ -82,6 +83,7 @@ public class PopupBox : ContentControl
         public const string PopupIsClosedStateName = "IsClosed";
         private PopupEx _popup;
         private ContentControl _popupContentControl;
+        private ToggleButton _toggleButton;
 
         static PopupBox()
         {
@@ -166,10 +168,8 @@ private static void IsPopupOpenPropertyChangedCallback(DependencyObject dependen
                     Mouse.Capture(null);
             }
 
-            if (newValue)
-            {                
-                popupBox.AnimateChildren();
-            }
+            if (newValue)            
+                popupBox.AnimateChildren();            
 
             VisualStateManager.GoToState(popupBox, newValue ? PopupIsOpenStateName : PopupIsClosedStateName, true);
         }        
@@ -228,14 +228,19 @@ public override void OnApplyTemplate()
         {
             if (_popup != null)
                 _popup.Loaded -= PopupOnLoaded;
+            if (_toggleButton != null)
+                _toggleButton.PreviewMouseLeftButtonUp -= ToggleButtonOnPreviewMouseLeftButtonUp;
 
             base.OnApplyTemplate();
 
             _popup = GetTemplateChild(PopupPartName) as PopupEx;
             _popupContentControl = GetTemplateChild(PopupContentControlPartName) as ContentControl;
+            _toggleButton = GetTemplateChild(TogglePartName) as ToggleButton;
 
             if (_popup != null)
                 _popup.Loaded += PopupOnLoaded;
+            if (_toggleButton != null)
+                _toggleButton.PreviewMouseLeftButtonUp += ToggleButtonOnPreviewMouseLeftButtonUp;                                
 
             VisualStateManager.GoToState(this, IsPopupOpen ? PopupIsOpenStateName : PopupIsClosedStateName, false);
         }
@@ -254,12 +259,12 @@ protected override void OnMouseEnter(MouseEventArgs e)
         {
             if (PopupMode == PopupBoxPopupMode.MouseOverEager
                 || PopupMode == PopupBoxPopupMode.MouseOver)
-
+            
                 SetCurrentValue(IsPopupOpenProperty, true);
 
             base.OnMouseEnter(e);
         }
-
+        
         protected override void OnMouseLeave(MouseEventArgs e)
         {
             if (PopupMode == PopupBoxPopupMode.MouseOverEager
@@ -419,7 +424,7 @@ private static void OnMouseButtonDown(object sender, MouseButtonEventArgs e)
         }
 
         protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
-        {
+        {            
             if (IsPopupOpen && !StaysOpen)
             {
                 Close();
@@ -437,6 +442,15 @@ private void PopupOnLoaded(object sender, RoutedEventArgs routedEventArgs)
                 _popup.IsOpen = true;
         }
 
+        private void ToggleButtonOnPreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs mouseButtonEventArgs)
+        {
+            if (PopupMode == PopupBoxPopupMode.Click || !IsPopupOpen) return;
+
+            Close();
+            Mouse.Capture(null);
+            mouseButtonEventArgs.Handled = true;
+        }
+
         private static object CoerceToolTipIsEnabled(DependencyObject dependencyObject, object value)
         {
             var popupBox = (PopupBox) dependencyObject;

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml

@@ -81,6 +81,11 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type wpf:PopupBox}">
                     <ControlTemplate.Resources>
+                        <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource MaterialDesignToolTip}">
+                            <Style.Setters>
+                                <Setter Property="Margin" Value="8 10 8 10" />
+                            </Style.Setters>
+                        </Style>
                         <Style TargetType="ToggleButton" x:Key="ToggleButtonStyle">
                             <Setter Property="Template">
                                 <Setter.Value>
@@ -254,7 +259,8 @@
             <Setter.Value>
                 <Viewbox Width="24" Height="24">
                     <Canvas Width="24" Height="24">
-                        <Path Data="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" Fill="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=wpf:PopupBox}, Path=Foreground}" />
+                        <Path Data="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" 
+                              Fill="{DynamicResource PrimaryHueMidForegroundBrush}" />
                     </Canvas>
                 </Viewbox>
             </Setter.Value>