Merge pull request #14 from ButchersBoy/master

spiegelp · spiegelp · commit 646b11f4c0b4 · 2016-06-04T10:41:55.000+02:00
update from original repo
diff --git a/MainDemo.Wpf/Buttons.xaml b/MainDemo.Wpf/Buttons.xaml
@@ -167,14 +167,22 @@
                     ToolTip="Resource name: MaterialDesignRaisedAccentButton">
                 ACCENT
             </Button>
-
         </StackPanel>
         <StackPanel Grid.Row="3"  Margin="0 24 0 0" Orientation="Horizontal">
             <Button Style="{StaticResource MaterialDesignRaisedAccentButton}"
                     Margin="0 0 8 0"
                     Width="150"
                     ToolTip="Resource name: MaterialDesignRaisedAccentButton"
                     materialDesign:RippleAssist.Feedback="#DD000000">CUSTOM RIPPLE</Button>
+            <Button Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                    Margin="0 0 8 0"
+                    Width="150"
+                    ToolTip="Resource name: MaterialDesignRaisedAccentButton"
+                    materialDesign:RippleAssist.IsDisabled="True">NO RIPPLE</Button>
+            <RepeatButton Margin="0 0 8 0" Width="100"
+                          ToolTip="Resource name: MaterialDesignRaisedButton">
+                REPEAT
+            </RepeatButton>
             <Button Style="{StaticResource MaterialDesignFlatButton}" Click="ButtonBase_OnClick" ToolTip="MaterialDesignFlatButton" Margin="200 0 0 0">ACCEPT</Button>
             <Button Style="{StaticResource MaterialDesignFlatButton}" ToolTip="MaterialDesignFlatButton">CANCEL</Button>
         </StackPanel>
diff --git a/MainDemo.Wpf/Pickers.xaml b/MainDemo.Wpf/Pickers.xaml
@@ -35,6 +35,15 @@
                     </Binding>
                 </DatePicker.SelectedDate>
             </DatePicker>
+            <ComboBox Name="LocaleCombo" HorizontalAlignment="Left" Width="50" Margin="0 32 0 0">
+                <ComboBox.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <VirtualizingStackPanel />
+                    </ItemsPanelTemplate>
+                </ComboBox.ItemsPanel>
+            </ComboBox>
+            <DatePicker Name="LocaleDatePicker" Width="120" HorizontalAlignment="Left" Margin="0 16 0 0" materialDesign:HintAssist.Hint="Locale Date" />
+            <DatePicker Name="LocaleDatePickerRTL" Width="120" HorizontalAlignment="Left" Margin="0 16 0 0" materialDesign:HintAssist.Hint="RTL Locale Date" FlowDirection="RightToLeft" />
         </StackPanel>
         <materialDesign:TimePicker Grid.Row="1" Grid.Column="1"  VerticalAlignment="Top"  Width="100" HorizontalAlignment="Left" Margin="0 16 0 0"
                                    Style="{StaticResource MaterialDesignFloatingHintTimePicker}"
diff --git a/MainDemo.Wpf/Pickers.xaml.cs b/MainDemo.Wpf/Pickers.xaml.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -25,6 +26,32 @@ public Pickers()
         {
             InitializeComponent();
             FutureDatePicker.BlackoutDates.AddDatesInPast();
+            LoadLocales();
+            LocaleCombo.SelectionChanged += LocaleCombo_SelectionChanged;
+            LocaleCombo.SelectedItem = "fr-CA";
+        }
+
+        private void LocaleCombo_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            var lang = System.Windows.Markup.XmlLanguage.GetLanguage((string)LocaleCombo.SelectedItem);
+            LocaleDatePicker.Language = lang;
+            LocaleDatePickerRTL.Language = lang;
+
+            //HACK: The calendar only refresh when we change the date
+            LocaleDatePicker.DisplayDate = LocaleDatePicker.DisplayDate.AddDays(1);
+            LocaleDatePicker.DisplayDate = LocaleDatePicker.DisplayDate.AddDays(-1);
+            LocaleDatePickerRTL.DisplayDate = LocaleDatePicker.DisplayDate.AddDays(1);
+            LocaleDatePickerRTL.DisplayDate = LocaleDatePicker.DisplayDate.AddDays(-1);
+        }
+
+        private void LoadLocales()
+        {
+            foreach (var ci in CultureInfo.GetCultures(CultureTypes.AllCultures)
+                .Where(ci => ci.Calendar is GregorianCalendar)
+                .OrderBy(ci => ci.Name))
+            {
+                LocaleCombo.Items.Add(ci.Name);
+            }
         }
 
         public void CalendarDialogOpenedEventHandler(object sender, DialogOpenedEventArgs eventArgs)
diff --git a/MaterialDesignThemes.Wpf/MaterialDateDisplay.cs b/MaterialDesignThemes.Wpf/MaterialDateDisplay.cs
@@ -18,27 +18,13 @@ namespace MaterialDesignThemes.Wpf
 {    
     public class MaterialDateDisplay : Control
     {
-        private readonly IDictionary<int, Action<string>> _setters;
-        private readonly IDictionary<char, string> _formats = new Dictionary<char, string>
-            {
-                {'d', "dd"},
-                {'m', "ddd, MMM"},
-                {'y', "yyyy"}
-            };
-
         static MaterialDateDisplay()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(MaterialDateDisplay), new FrameworkPropertyMetadata(typeof(MaterialDateDisplay)));
         }
 
         public MaterialDateDisplay()
         {
-            _setters = new Dictionary<int, Action<string>>
-            {
-                {0, s => ComponentOneContent = s},
-                {1, s => ComponentTwoContent = s},
-                {2, s => ComponentThreeContent = s},
-            };
             SetCurrentValue(DisplayDateProperty, DateTime.Now.Date);
         }
 
@@ -115,15 +101,12 @@ public bool IsDayInFirstComponent
         //FrameworkElement.LanguageProperty.OverrideMetadata(typeof (Calendar), (PropertyMetadata) new FrameworkPropertyMetadata(new PropertyChangedCallback(Calendar.OnLanguageChanged)));
         private void UpdateComponents()
         {
-            var dateTimeFormatInfo = CultureInfo.CurrentUICulture.GetDateFormat();
+            var culture = Language.GetSpecificCulture();
+            var dateTimeFormatInfo = culture.GetDateFormat();
 
-            foreach (var component in dateTimeFormatInfo.ShortDatePattern.Split(new[] {dateTimeFormatInfo.DateSeparator},
-                StringSplitOptions.RemoveEmptyEntries).Select((s, index) => new {code = s.ToLower()[0], index}))
-            {
-	            if (component.index == 0)
-		            IsDayInFirstComponent = component.code == 'd';
-				_setters[component.index](DisplayDate.ToString(_formats[component.code], CultureInfo.CurrentUICulture).ToTitleCase());
-            }					       
+            ComponentOneContent = DisplayDate.ToString(dateTimeFormatInfo.MonthDayPattern.Replace("MMMM", "MMM"), culture).ToTitleCase(culture);     //Day Month folowing culture order. We don't want the month to take too much space
+            ComponentTwoContent = DisplayDate.ToString("ddd,", culture).ToTitleCase(culture);       // Day of week first
+            ComponentThreeContent = DisplayDate.ToString("yyyy", culture).ToTitleCase(culture);     // Year always top
         }
 
         /// <summary>
diff --git a/MaterialDesignThemes.Wpf/PopupBox.cs b/MaterialDesignThemes.Wpf/PopupBox.cs
@@ -657,7 +657,7 @@ private static void OnLostMouseCapture(object sender, MouseEventArgs e)
                 }
                 else
                 {
-                    if (popupBox.StaysOpen)
+                    if (popupBox.StaysOpen && popupBox.IsPopupOpen)
                     {
                         // Take capture back because click happend outside of control
                         Mouse.Capture(popupBox, CaptureMode.SubTree);
diff --git a/MaterialDesignThemes.Wpf/Ripple.cs b/MaterialDesignThemes.Wpf/Ripple.cs
@@ -118,9 +118,12 @@ protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)
                 RippleY = point.Y - RippleSize / 2;
             }
 
-            VisualStateManager.GoToState(this, TemplateStateNormal, false);
-            VisualStateManager.GoToState(this, TemplateStateMousePressed, true);
-            PressedInstances.Add(this);            
+            if (!RippleAssist.GetIsDisabled(this))
+            {
+                VisualStateManager.GoToState(this, TemplateStateNormal, false);
+                VisualStateManager.GoToState(this, TemplateStateMousePressed, true);
+                PressedInstances.Add(this);
+            }
 
             base.OnPreviewMouseLeftButtonDown(e);
         }
diff --git a/MaterialDesignThemes.Wpf/RippleAssist.cs b/MaterialDesignThemes.Wpf/RippleAssist.cs
@@ -54,6 +54,35 @@ public static bool GetIsCentered(DependencyObject element)
 
         #endregion
 
+        #region disable 
+
+        /// <summary>
+        /// Set to <c>True</c> to disable ripple effect
+        /// </summary>
+        public static readonly DependencyProperty IsDisabledProperty = DependencyProperty.RegisterAttached(
+            "IsDisabled", typeof(bool), typeof(RippleAssist), new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.Inherits));
+
+        /// <summary>
+        /// Set to <c>True</c> to disable ripple effect
+        /// </summary>
+        /// <param name="element"></param>
+        /// <param name="value"></param>
+        public static void SetIsDisabled(DependencyObject element, bool value)
+        {
+            element.SetValue(IsDisabledProperty, value);
+        }
+
+        /// <summary>
+        /// Set to <c>True</c> to disable ripple effect
+        /// </summary>
+        /// <param name="element"></param>        
+        public static bool GetIsDisabled(DependencyObject element)
+        {
+            return (bool)element.GetValue(IsDisabledProperty);
+        }
+
+        #endregion
+
         #region RippleSizeMultiplier
 
         public static readonly DependencyProperty RippleSizeMultiplierProperty = DependencyProperty.RegisterAttached(
diff --git a/MaterialDesignThemes.Wpf/StringExtensions.cs b/MaterialDesignThemes.Wpf/StringExtensions.cs
@@ -9,9 +9,9 @@ namespace MaterialDesignThemes.Wpf
 {
     internal static class StringExtensions
     {
-        public static string ToTitleCase(this string text, string separator = " ")
+        public static string ToTitleCase(this string text, CultureInfo culture, string separator = " ")
         {
-            TextInfo textInfo = CultureInfo.CurrentUICulture.TextInfo;
+            TextInfo textInfo = culture.TextInfo;
 
             string lowerText = textInfo.ToLower(text);
             string[] words = lowerText.Split(new[] { separator }, StringSplitOptions.None);
diff --git a/MaterialDesignThemes.Wpf/Themes/Generic.xaml b/MaterialDesignThemes.Wpf/Themes/Generic.xaml
@@ -850,8 +850,8 @@
         </Setter>
     </Style>
 
-    <Style TargetType="{x:Type transitions:TransitioningContentBase}">
-        
+    <Style TargetType="{x:Type transitions:TransitioningContentBase}">
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type transitions:TransitioningContentBase}">
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml
@@ -20,7 +20,7 @@
 
     <SolidColorBrush x:Key="AttentionToActionBrush" Color="{StaticResource MaterialDesignShadow}" Opacity=".23" po:Freeze="True" />
 
-    <Style x:Key="MaterialDesignRaisedButton" TargetType="{x:Type Button}">
+    <Style x:Key="MaterialDesignRaisedButton" TargetType="{x:Type ButtonBase}">
         <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
         <Setter Property="Background" Value="{DynamicResource PrimaryHueMidBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueMidBrush}"/>
@@ -37,7 +37,7 @@
         <Setter Property="Height" Value="32" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
+                <ControlTemplate TargetType="{x:Type ButtonBase}">
                     <Grid>
                         <AdornerDecorator>
                             <AdornerDecorator.CacheMode>
@@ -69,19 +69,19 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MaterialDesignRaisedLightButton" TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignRaisedButton}">
+    <Style x:Key="MaterialDesignRaisedLightButton" TargetType="{x:Type ButtonBase}" BasedOn="{StaticResource MaterialDesignRaisedButton}">
         <Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueLightBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryHueLightForegroundBrush}"/>
     </Style>
 
-    <Style x:Key="MaterialDesignRaisedDarkButton" TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignRaisedButton}">
+    <Style x:Key="MaterialDesignRaisedDarkButton" TargetType="{x:Type ButtonBase}" BasedOn="{StaticResource MaterialDesignRaisedButton}">
         <Setter Property="Background" Value="{DynamicResource PrimaryHueDarkBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueDarkBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkForegroundBrush}"/>
     </Style>
 
-    <Style x:Key="MaterialDesignRaisedAccentButton" TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignRaisedButton}">
+    <Style x:Key="MaterialDesignRaisedAccentButton" TargetType="{x:Type ButtonBase}" BasedOn="{StaticResource MaterialDesignRaisedButton}">
         <Setter Property="Background" Value="{DynamicResource SecondaryAccentBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource SecondaryAccentBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource SecondaryAccentForegroundBrush}"/>
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Calendar.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Calendar.xaml
@@ -421,7 +421,7 @@
                                            Grid.Row="1" Grid.Column="1"
                                            FontWeight="SemiBold"
                                            RenderTransformOrigin="0, 0.5"
-                                           Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}, Path=DisplayDate, ConverterCulture={x:Static globalization:CultureInfo.CurrentUICulture}, StringFormat=MMMM yyyy}">
+                                           Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}, Path=DisplayDate, StringFormat=MMMM yyyy}">
                                     <TextBlock.RenderTransform>
                                         <TranslateTransform X="0" Y="0"/>
                                     </TextBlock.RenderTransform>
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Defaults.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Defaults.xaml
@@ -59,6 +59,7 @@
     <Style TargetType="{x:Type PasswordBox}" BasedOn="{StaticResource MaterialDesignPasswordBox}" />
     <Style TargetType="{x:Type ProgressBar}" BasedOn="{StaticResource MaterialDesignLinearProgressBar}" />
     <Style TargetType="{x:Type RadioButton}" BasedOn="{StaticResource MaterialDesignRadioButton}" />
+    <Style TargetType="{x:Type RepeatButton}" BasedOn="{StaticResource MaterialDesignRaisedButton}" />
     <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource MaterialDesignScrollBar}" />
     <Style TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource MaterialDesignScrollViewer}" />
     <Style TargetType="{x:Type Slider}" BasedOn="{StaticResource MaterialDesignSlider}" />

Original file line number	Diff line number	Diff line change
`@@ -18,27 +18,13 @@ namespace MaterialDesignThemes.Wpf`
`18`	`18`	`{`
`19`	`19`	`public class MaterialDateDisplay : Control`
`20`	`20`	`{`
`21`		`- private readonly IDictionary<int, Action<string>> _setters;`
`22`		`- private readonly IDictionary<char, string> _formats = new Dictionary<char, string>`
`23`		`- {`
`24`		`- {'d', "dd"},`
`25`		`- {'m', "ddd, MMM"},`
`26`		`- {'y', "yyyy"}`
`27`		`- };`
`28`		`-`
`29`	`21`	`static MaterialDateDisplay()`
`30`	`22`	`{`
`31`	`23`	`DefaultStyleKeyProperty.OverrideMetadata(typeof(MaterialDateDisplay), new FrameworkPropertyMetadata(typeof(MaterialDateDisplay)));`
`32`	`24`	`}`
`33`	`25`
`34`	`26`	`public MaterialDateDisplay()`
`35`	`27`	`{`
`36`		`- _setters = new Dictionary<int, Action<string>>`
`37`		`- {`
`38`		`- {0, s => ComponentOneContent = s},`
`39`		`- {1, s => ComponentTwoContent = s},`
`40`		`- {2, s => ComponentThreeContent = s},`
`41`		`- };`
`42`	`28`	`SetCurrentValue(DisplayDateProperty, DateTime.Now.Date);`
`43`	`29`	`}`
`44`	`30`
`@@ -115,15 +101,12 @@ public bool IsDayInFirstComponent`
`115`	`101`	`//FrameworkElement.LanguageProperty.OverrideMetadata(typeof (Calendar), (PropertyMetadata) new FrameworkPropertyMetadata(new PropertyChangedCallback(Calendar.OnLanguageChanged)));`
`116`	`102`	`private void UpdateComponents()`
`117`	`103`	`{`
`118`		`- var dateTimeFormatInfo = CultureInfo.CurrentUICulture.GetDateFormat();`
	`104`	`+ var culture = Language.GetSpecificCulture();`
	`105`	`+ var dateTimeFormatInfo = culture.GetDateFormat();`
`119`	`106`
`120`		`- foreach (var component in dateTimeFormatInfo.ShortDatePattern.Split(new[] {dateTimeFormatInfo.DateSeparator},`
`121`		`- StringSplitOptions.RemoveEmptyEntries).Select((s, index) => new {code = s.ToLower()[0], index}))`
`122`		`- {`
`123`		`- if (component.index == 0)`
`124`		`- IsDayInFirstComponent = component.code == 'd';`
`125`		`- _setters[component.index](DisplayDate.ToString(_formats[component.code], CultureInfo.CurrentUICulture).ToTitleCase());`
`126`		`- }`
	`107`	`+ ComponentOneContent = DisplayDate.ToString(dateTimeFormatInfo.MonthDayPattern.Replace("MMMM", "MMM"), culture).ToTitleCase(culture); //Day Month folowing culture order. We don't want the month to take too much space`
	`108`	`+ ComponentTwoContent = DisplayDate.ToString("ddd,", culture).ToTitleCase(culture); // Day of week first`
	`109`	`+ ComponentThreeContent = DisplayDate.ToString("yyyy", culture).ToTitleCase(culture); // Year always top`
`127`	`110`	`}`
`128`	`111`
`129`	`112`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -657,7 +657,7 @@ private static void OnLostMouseCapture(object sender, MouseEventArgs e)`
`657`	`657`	`}`
`658`	`658`	`else`
`659`	`659`	`{`
`660`		`- if (popupBox.StaysOpen)`
	`660`	`+ if (popupBox.StaysOpen && popupBox.IsPopupOpen)`
`661`	`661`	`{`
`662`	`662`	`// Take capture back because click happend outside of control`
`663`	`663`	`Mouse.Capture(popupBox, CaptureMode.SubTree);`
Original file line number	Diff line number	Diff line change
`@@ -118,9 +118,12 @@ protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)`
`118`	`118`	`RippleY = point.Y - RippleSize / 2;`
`119`	`119`	`}`
`120`	`120`
`121`		`- VisualStateManager.GoToState(this, TemplateStateNormal, false);`
`122`		`- VisualStateManager.GoToState(this, TemplateStateMousePressed, true);`
`123`		`- PressedInstances.Add(this);`
	`121`	`+ if (!RippleAssist.GetIsDisabled(this))`
	`122`	`+ {`
	`123`	`+ VisualStateManager.GoToState(this, TemplateStateNormal, false);`
	`124`	`+ VisualStateManager.GoToState(this, TemplateStateMousePressed, true);`
	`125`	`+ PressedInstances.Add(this);`
	`126`	`+ }`
`124`	`127`
`125`	`128`	`base.OnPreviewMouseLeftButtonDown(e);`
`126`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ namespace MaterialDesignThemes.Wpf`
`9`	`9`	`{`
`10`	`10`	`internal static class StringExtensions`
`11`	`11`	`{`
`12`		`- public static string ToTitleCase(this string text, string separator = " ")`
	`12`	`+ public static string ToTitleCase(this string text, CultureInfo culture, string separator = " ")`
`13`	`13`	`{`
`14`		`- TextInfo textInfo = CultureInfo.CurrentUICulture.TextInfo;`
	`14`	`+ TextInfo textInfo = culture.TextInfo;`
`15`	`15`
`16`	`16`	`string lowerText = textInfo.ToLower(text);`
`17`	`17`	`string[] words = lowerText.Split(new[] { separator }, StringSplitOptions.None);`