Skip to content

Commit 1f69f3a

Browse files
KebooKeboo
authored
Fix mah apps integration (#1483)
* Starting work on fixing mah apps integration * More work setting up mah app brushes. * Last of the changes to support MahApps 2.0.0
1 parent 5decd19 commit 1f69f3a

15 files changed

+592
-325
lines changed

‎MahMaterialDragablzMashUp/App.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88
<Application.Resources>
99
<ResourceDictionary>
1010
<ResourceDictionary.MergedDictionaries>
11-
<materialDesign:MahAppsBundledTheme BaseTheme="Light" PrimaryColor="DeepPurple" SecondaryColor="Lime"/>
11+
<materialDesign:MahAppsBundledTheme BaseTheme="Light" PrimaryColor="DeepPurple" SecondaryColor="LightBlue"/>
1212

1313
<!-- MahApps -->
1414
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
1515
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
16-
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
1716

1817
<!-- Material Design -->
1918
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />

‎MahMaterialDragablzMashUp/FlyoutContent.xaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
xmlns:local="clr-namespace:MahMaterialDragablzMashUp"
7-
xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf;assembly=MaterialDesignThemes.Wpf"
6+
xmlns:wpf="http://materialdesigninxaml.net/winfx/xaml/themes"
87
mc:Ignorable="d"
98
d:DesignHeight="300" d:DesignWidth="300">
109
<UserControl.Resources>
@@ -15,7 +14,7 @@
1514
</ResourceDictionary>
1615
</UserControl.Resources>
1716
<StackPanel Margin="24">
18-
<TextBox Style="{StaticResource MaterialDesignFloatingHintTextBox}" FontSize="18" MinWidth="120" />
19-
<TextBox Style="{StaticResource MaterialDesignFloatingHintTextBox}" MinWidth="120" Margin="0 8 0 0" />
17+
<TextBox Style="{StaticResource MaterialDesignFloatingHintTextBox}" wpf:HintAssist.Hint="Hint 1" FontSize="18" MinWidth="120" />
18+
<TextBox Style="{StaticResource MaterialDesignFloatingHintTextBox}" wpf:HintAssist.Hint="Hint 2" MinWidth="120" Margin="0 8 0 0" />
2019
</StackPanel>
2120
</UserControl>

‎MahMaterialDragablzMashUp/Mah.xaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
77
xmlns:local="clr-namespace:MahAppsDragablzDemo"
88
xmlns:system="clr-namespace:System;assembly=mscorlib"
9+
xmlns:mdix="http://materialdesigninxaml.net/winfx/xaml/themes"
910
mc:Ignorable="d"
1011
d:DesignHeight="300" d:DesignWidth="300">
1112
<UserControl.DataContext>
@@ -26,7 +27,7 @@
2627
<StackPanel>
2728
<controls:ToggleSwitch IsChecked="True" HorizontalAlignment="Left" />
2829
<Button Width="100" Margin="0 8 0 0" Content="Nice" HorizontalAlignment="Left"
29-
Style="{DynamicResource AccentedSquareButtonStyle}" />
30+
Style="{StaticResource MahApps.Styles.Button.AccentedSquare}" />
3031
</StackPanel>
3132
</TabItem>
3233
<TabItem Header="Sliders">
@@ -53,13 +54,16 @@
5354
</ObjectDataProvider>
5455
</DataGrid.Resources>
5556
<DataGrid.Columns>
56-
<DataGridCheckBoxColumn Binding="{Binding IsChecked}">
57+
<DataGridCheckBoxColumn Binding="{Binding IsChecked}"
58+
ElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnStyle}"
59+
EditingElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnEditingStyle}">
5760
<DataGridCheckBoxColumn.Header>
5861
<CheckBox IsChecked="False" IsEnabled="False"/>
5962
</DataGridCheckBoxColumn.Header>
6063
</DataGridCheckBoxColumn>
61-
<DataGridTextColumn Header="Text" Binding="{Binding Text}"/>
62-
<DataGridComboBoxColumn Header="Combo" SelectedItemBinding="{Binding EnumValue}" ItemsSource="{Binding Source={StaticResource EnumValues}}"/>
64+
<mdix:DataGridTextColumn Header="Text" Binding="{Binding Text}"
65+
EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnPopupEditingStyle}"/>
66+
<mdix:DataGridComboBoxColumn Header="Combo" SelectedItemBinding="{Binding EnumValue}" ItemsSource="{Binding Source={StaticResource EnumValues}}"/>
6367
<controls:DataGridNumericUpDownColumn Binding="{Binding IntValue}"
6468
Header="Numeric"
6569
Minimum="0"

‎MahMaterialDragablzMashUp/MainWindow.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
WindowTransitionsEnabled="False"
1010
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
1111
Background="{DynamicResource MaterialDesignPaper}"
12-
GlowBrush="{DynamicResource AccentColorBrush}"
13-
FontFamily="{StaticResource DefaultFont}"
12+
GlowBrush="{DynamicResource MahApps.Brushes.Accent}"
13+
FontFamily="{StaticResource MahApps.Fonts.Default}"
1414
Title="Material-MahApps-Dragablz Mash Up" Height="640" Width="800">
1515
<controls:MetroWindow.Flyouts>
1616
<controls:FlyoutsControl>

‎MainDemo.Wpf/Grids.xaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,31 @@
2222
materialDesign:DataGridAssist.CellPadding="13 8 8 8" materialDesign:DataGridAssist.ColumnHeaderPadding="8">
2323
<DataGrid.Columns>
2424
<DataGridCheckBoxColumn Binding="{Binding IsSelected}"
25-
ElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnStyle}"
26-
EditingElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnEditingStyle}">
25+
ElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnStyle}"
26+
EditingElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnEditingStyle}">
2727
<DataGridCheckBoxColumn.Header>
2828
<!--padding to allow hit test to pass thru for sorting -->
2929
<Border Background="Transparent" Padding="6 0 6 0" HorizontalAlignment="Center">
3030
<CheckBox HorizontalAlignment="Center"
31-
DataContext="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=DataContext}"
32-
IsChecked="{Binding IsAllItems3Selected}" />
31+
DataContext="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=DataContext}"
32+
IsChecked="{Binding IsAllItems3Selected}" />
3333
</Border>
3434
</DataGridCheckBoxColumn.Header>
3535
</DataGridCheckBoxColumn>
3636
<DataGridTextColumn Binding="{Binding Code}"
3737
Header="Code"
3838
EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}" />
3939
<!-- if you want to use the pop up style (MaterialDesignDataGridTextColumnPopupEditingStyle), you must use MaterialDataGridTextColumn -->
40-
<materialDesign:MaterialDataGridTextColumn Binding="{Binding Name}"
41-
Header="Name"
42-
EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnPopupEditingStyle}"
43-
/>
40+
<materialDesign:DataGridTextColumn Binding="{Binding Name}"
41+
Header="Name"
42+
EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnPopupEditingStyle}"
43+
/>
4444
<!-- set a max length to get an indicator in the editor -->
45-
<materialDesign:MaterialDataGridTextColumn Binding="{Binding Description}"
46-
Header="Description"
47-
MaxLength="255"
48-
EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnPopupEditingStyle}" />
49-
<materialDesign:MaterialDataGridTextColumn Binding="{Binding Numeric}"
45+
<materialDesign:DataGridTextColumn Binding="{Binding Description}"
46+
Header="Description"
47+
MaxLength="255"
48+
EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnPopupEditingStyle}" />
49+
<materialDesign:DataGridTextColumn Binding="{Binding Numeric}"
5050
Header="Number with long header"
5151
Width="120"
5252
EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnPopupEditingStyle}">
@@ -67,7 +67,7 @@
6767
<Setter Property="HorizontalAlignment" Value="Right" />
6868
</Style>
6969
</DataGridTextColumn.ElementStyle>
70-
</materialDesign:MaterialDataGridTextColumn>
70+
</materialDesign:DataGridTextColumn>
7171

7272
<!-- use custom combo box column to get better combos. Use ItemsSourceBinding as your binding template to be applied to each combo -->
7373
<materialDesign:DataGridComboBoxColumn Header="Food" IsEditable="True"

0 commit comments

Comments
 (0)