Merge branch 'master' of https://github.com/ButchersBoy/MaterialDesignInXamlToolkit

ButchersBoy · ButchersBoy · commit 7ee5c2b0815d · 2016-11-28T09:07:09.000Z
diff --git a/MainDemo.Wpf/Grids.xaml b/MainDemo.Wpf/Grids.xaml
@@ -20,32 +20,31 @@
                       materialDesign:DataGridAssist.CellPadding="13 8 8 8" materialDesign:DataGridAssist.ColumnHeaderPadding="8">
                 <DataGrid.Columns>
                     <DataGridCheckBoxColumn Binding="{Binding IsSelected}" 
-                                                ElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnStyle}"
-                                                EditingElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnEditingStyle}">
+                                            ElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnStyle}"
+                                            EditingElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnEditingStyle}"
+                                            >
                         <DataGridCheckBoxColumn.Header>
                             <!--padding to allow hit test to pass thru for sorting -->
                             <Border Background="Transparent" Padding="6 0 6 0" HorizontalAlignment="Center">
                                 <CheckBox HorizontalAlignment="Center"                                               
-                                              DataContext="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=DataContext}"
-                                              IsChecked="{Binding IsAllItems3Selected}" />
+                                          DataContext="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=DataContext}"
+                                          IsChecked="{Binding IsAllItems3Selected}" />
                             </Border>
                         </DataGridCheckBoxColumn.Header>
                     </DataGridCheckBoxColumn>
                     <DataGridTextColumn Binding="{Binding Code}"
-                                            Header="Code"
-                                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
-                                            />
+                                        Header="Code"
+                                        EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}" />
                     <!-- if you want to use the pop up style (MaterialDesignDataGridTextColumnPopupEditingStyle), you must use MaterialDataGridTextColumn -->
                     <materialDesign:MaterialDataGridTextColumn Binding="{Binding Name}"
-                                                        Header="Name"                                                        
-                                                        EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnPopupEditingStyle}" 
-                                                        />
+                                                               Header="Name"                                                        
+                                                               EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnPopupEditingStyle}" 
+                                                               />
                     <!-- set a max length to get an indicator in the editor -->
                     <materialDesign:MaterialDataGridTextColumn Binding="{Binding Description}"
-                                                        Header="Description"                                                        
-                                                        MaxLength="255" 
-                                                        EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnPopupEditingStyle}" 
-                                                        />
+                                                               Header="Description"                                                        
+                                                               MaxLength="255" 
+                                                               EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnPopupEditingStyle}"  />
                     <materialDesign:MaterialDataGridTextColumn Binding="{Binding Numeric}"
                                                         Header="Numeric"                                                         
                                                         EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnPopupEditingStyle}">
@@ -63,8 +62,8 @@
 
                     <!-- use custom combo box column to get better combos. Use ItemsSourceBinding as your binding template to be applied to each combo -->
                     <materialDesign:MaterialDataGridComboBoxColumn Header="Food"        
-                                                            SelectedValueBinding="{Binding Food}"                                                            
-                                                            ItemsSourceBinding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGrid}}, Path=DataContext.Foods}" />
+                                                                   SelectedValueBinding="{Binding Food}"                                                            
+                                                                   ItemsSourceBinding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGrid}}, Path=DataContext.Foods}" />
                 </DataGrid.Columns>
             </DataGrid>
             <TextBlock Margin="0 24 0 0">Auto Generated Columns</TextBlock>
diff --git a/MaterialDesignThemes.Wpf/DataGridAssist.cs b/MaterialDesignThemes.Wpf/DataGridAssist.cs
@@ -164,6 +164,8 @@ private static void DataGridOnPreviewMouseLeftButtonDown(object sender,
                 var dataGridCell = inputHitTest as DataGridCell;                
                 if (dataGridCell != null && dataGrid.Equals(dataGridCell.GetVisualAncestry().OfType<DataGrid>().FirstOrDefault()))
                 {
+                    if (dataGridCell.IsReadOnly) return;
+
                     ToggleButton toggleButton;
                     ComboBox comboBox;
                     if (IsDirectHitOnEditComponent(dataGridCell, mouseButtonEventArgs, out toggleButton))
diff --git a/MaterialDesignThemes.Wpf/MaterialDataGridTextColumn.cs b/MaterialDesignThemes.Wpf/MaterialDataGridTextColumn.cs
@@ -1,5 +1,6 @@
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Threading;
 
 namespace MaterialDesignThemes.Wpf
 {
@@ -9,9 +10,12 @@ protected override object PrepareCellForEdit(FrameworkElement editingElement, Ro
         {
             var textBox = editingElement as TextBox;
             if (textBox != null)
+            {                
                 textBox.MaxLength = MaxLength;
+                textBox.SelectionStart = textBox.Text.Length;
+            }
 
-            editingElement.Focus();
+            editingElement.Focus();            
 
             return null;
         }
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DataGrid.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DataGrid.xaml
@@ -1,7 +1,8 @@
 ﻿<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf"
-                    xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters">
+                    xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
+                    xmlns:controlzEx="clr-namespace:ControlzEx">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/materialdesigntheme.checkbox.xaml" />
@@ -46,8 +47,7 @@
                     <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"
                             Padding="0 -1 0 3">
                         <Grid>
-                            <ScrollViewer x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"
-											  />
+                            <ScrollViewer x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
                             <wpf:SmartHint x:Name="Hint"
                                            Margin="1 0"
                                            Hint="{Binding Path=(wpf:HintAssist.Hint), RelativeSource={RelativeSource TemplatedParent}}"
@@ -71,9 +71,9 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">
                     <Grid>
-                        <Popup IsOpen="True" AllowsTransparency="True" Placement="RelativePoint" HorizontalOffset="-6" VerticalOffset="-6" 
-                               PlacementTarget="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGridCell}}}"                                                              
-                               PopupAnimation="Fade">
+                        <controlzEx:PopupEx IsOpen="True" AllowsTransparency="True" Placement="RelativePoint" HorizontalOffset="-6" VerticalOffset="-6" 
+                                            PlacementTarget="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGridCell}}}"                                                              
+                                            PopupAnimation="Fade">
                             <Grid>
                                 <AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
                                     <Border Background="{DynamicResource MaterialDesignPaper}" CornerRadius="2"
@@ -94,8 +94,7 @@
                                         <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"
                                             Padding="0 -1 0 3">
                                             <Grid>
-                                                <ScrollViewer x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"
-											          />
+                                                <ScrollViewer x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
                                                 <wpf:SmartHint x:Name="Hint"
                                                                Margin="1 0"
                                                                Hint="{Binding Path=(wpf:HintAssist.Hint), RelativeSource={RelativeSource TemplatedParent}}"
@@ -117,7 +116,7 @@
                                     </Grid>
                                 </Border>
                             </Grid>
-                        </Popup>
+                        </controlzEx:PopupEx>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.GroupBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.GroupBox.xaml
@@ -23,15 +23,16 @@
     <Style x:Key="MaterialDesignGroupBox" TargetType="{x:Type GroupBox}">
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}"/>
-        <Setter Property="Padding" Value="6,6,6,6"/>
+        <Setter Property="Padding" Value="9"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="SnapsToDevicePixels" Value="true"/>
         <Setter Property="wpf:ShadowAssist.ShadowDepth" Value="Depth0" />
         <Setter Property="wpf:ColorZoneAssist.Mode" Value="PrimaryMid" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type GroupBox}">
-                    <Border Background="{TemplateBinding Background}" BorderBrush="{Binding Path=Background, ElementName=PART_ColorZone}" BorderThickness="{TemplateBinding BorderThickness}">
+                    <Grid>
+                        <Border Background="{TemplateBinding Background}" BorderBrush="{Binding Path=Background, ElementName=PART_ColorZone}" BorderThickness="{TemplateBinding BorderThickness}" />
                         <DockPanel Background="{TemplateBinding Background}">
                             <wpf:ColorZone UseLayoutRounding="True" x:Name="PART_ColorZone" DockPanel.Dock="Top" Padding="{TemplateBinding Padding}" Effect="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ShadowAssist.ShadowDepth), Converter={x:Static converters:ShadowConverter.Instance}}" Mode="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Mode)}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                                 <ContentPresenter ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
@@ -44,7 +45,7 @@
                                               ContentTemplate="{TemplateBinding ContentTemplate}"
                                               ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"/>
                         </DockPanel>
-                    </Border>
+                    </Grid>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -53,7 +54,7 @@
     <Style x:Key="MaterialDesignCardGroupBox" TargetType="{x:Type GroupBox}">
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}"/>
-        <Setter Property="Padding" Value="6,6,6,6"/>
+        <Setter Property="Padding" Value="9"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="SnapsToDevicePixels" Value="true"/>
         <Setter Property="wpf:ShadowAssist.ShadowDepth" Value="Depth0" />

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,8 @@ private static void DataGridOnPreviewMouseLeftButtonDown(object sender,`
`164`	`164`	`var dataGridCell = inputHitTest as DataGridCell;`
`165`	`165`	`if (dataGridCell != null && dataGrid.Equals(dataGridCell.GetVisualAncestry().OfType<DataGrid>().FirstOrDefault()))`
`166`	`166`	`{`
	`167`	`+ if (dataGridCell.IsReadOnly) return;`
	`168`	`+`
`167`	`169`	`ToggleButton toggleButton;`
`168`	`170`	`ComboBox comboBox;`
`169`	`171`	`if (IsDirectHitOnEditComponent(dataGridCell, mouseButtonEventArgs, out toggleButton))`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System.Windows;`
`2`	`2`	`using System.Windows.Controls;`
	`3`	`+using System.Windows.Threading;`
`3`	`4`
`4`	`5`	`namespace MaterialDesignThemes.Wpf`
`5`	`6`	`{`
`@@ -9,9 +10,12 @@ protected override object PrepareCellForEdit(FrameworkElement editingElement, Ro`
`9`	`10`	`{`
`10`	`11`	`var textBox = editingElement as TextBox;`
`11`	`12`	`if (textBox != null)`
	`13`	`+ {`
`12`	`14`	`textBox.MaxLength = MaxLength;`
	`15`	`+ textBox.SelectionStart = textBox.Text.Length;`
	`16`	`+ }`
`13`	`17`
`14`		`- editingElement.Focus();`
	`18`	`+ editingElement.Focus();`
`15`	`19`
`16`	`20`	`return null;`
`17`	`21`	`}`