Merge pull request #239 from hshahdoost/RTL

MaterialDesignMultiFloatingActionPopupBox RTL bug fixed

Author: ButchersBoy

MaterialDesignThemes.Wpf/ComboBoxPopup.cs

@@ -116,7 +116,16 @@ private CustomPopupPlacement[] ComboBoxCustomPopupPlacementCallback(Size popupSi
             var locationY = (int)locationFromScreen.Y % screenHeight;
 
             var realOffsetX = (popupSize.Width - targetSize.Width) / 2.0;
-            var offsetX = DpiHelper.TransformToDeviceX(mainVisual, offset.X);
+
+            double offsetX;
+            const int rtlHorizontalOffset = 20;
+
+            if (FlowDirection == FlowDirection.LeftToRight)
+                offsetX = DpiHelper.TransformToDeviceX(mainVisual, offset.X);
+            else
+                offsetX = DpiHelper.TransformToDeviceX(mainVisual,
+                    offset.X - targetSize.Width - rtlHorizontalOffset);
+
             var defaultVerticalOffsetIndepent = DpiHelper.TransformToDeviceY(mainVisual, DefaultVerticalOffset);
             var upVerticalOffsetIndepent = DpiHelper.TransformToDeviceY(mainVisual, UpVerticalOffset);
             var downVerticalOffsetIndepent = DpiHelper.TransformToDeviceY(mainVisual, DownVerticalOffset);

MaterialDesignThemes.Wpf/PackIcon.cs

@@ -17,9 +17,8 @@ public class PackIcon : PackIconBase<PackIconKind>
         static PackIcon()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(PackIcon), new FrameworkPropertyMetadata(typeof(PackIcon)));
-        }     
+        }
 
-        public PackIcon() : base(PackIconDataFactory.Create)
-        { }    
+        public PackIcon() : base(PackIconDataFactory.Create) { }
     }
 }

MaterialDesignThemes.Wpf/PopupBox.cs

@@ -22,7 +22,7 @@ namespace MaterialDesignThemes.Wpf
     public enum PopupBoxPlacementMode
     {
         /// <summary>
-        /// Display the popup below the toggle, and align the left edges.
+        /// Display the popup below the toggle, and align the left edges.3
         /// </summary>
         BottomAndAlignLeftEdges,
         /// <summary>
@@ -400,6 +400,12 @@ protected void Close()
         private CustomPopupPlacement[] GetPopupPlacement(Size popupSize, Size targetSize, Point offset)
         {
             double x, y;
+			
+			
+            if (FlowDirection == FlowDirection.RightToLeft)
+                offset.X += targetSize.Width / 2;
+
+			
             switch (PlacementMode)
             {
                 case PopupBoxPlacementMode.BottomAndAlignLeftEdges:

MaterialDesignThemes.Wpf/Themes/Generic.xaml

@@ -787,13 +787,14 @@
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="FlowDirection" Value="LeftToRight" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:PackIcon}">
                     <Border Background="{TemplateBinding Background}" 
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}">
-                        <Viewbox>
+                        <Viewbox FlowDirection="{TemplateBinding FlowDirection}">
                             <Canvas Width="24" Height="24">
                                 <Path Data="{Binding Data, RelativeSource={RelativeSource TemplatedParent}}"                                   
                                       Fill="{TemplateBinding Foreground}" />

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.CheckBox.xaml

@@ -82,7 +82,8 @@
                             <ColumnDefinition Width="Auto"/>
                             <ColumnDefinition Width="*"/>
                         </Grid.ColumnDefinitions>
-                        <Viewbox Width="18" Height="18"  VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                        <Viewbox Width="18" Height="18"  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                 FlowDirection="LeftToRight">
                             <Canvas Width="24" Height="24">
                                 <Path x:Name="Graphic"
                                       Data="M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3M19,5V19H5V5H19Z" 

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToggleButton.xaml

@@ -136,7 +136,7 @@
 						</VisualStateManager.VisualStateGroups>
 						<Ellipse Fill="{TemplateBinding Background}" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" x:Name="UncheckedEllipse" Opacity=".54" />
 						<Ellipse Fill="{TemplateBinding Background}" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" x:Name="CheckedEllipse" />
-						<Viewbox Width="24" Height="24" x:Name="CheckMark" Visibility="Hidden" HorizontalAlignment="Center" VerticalAlignment="Center">
+						<Viewbox Width="24" Height="24" x:Name="CheckMark" Visibility="Hidden" HorizontalAlignment="Center" VerticalAlignment="Center" FlowDirection="LeftToRight">
 							<Canvas Width="24" Height="24">
 								<Path Data="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z" Fill="{TemplateBinding Foreground}" />
 							</Canvas>