Skip to content

Commit 37e94a4

Browse files
wongjiahauwongjiahau
committed
Succesfully injected XamlDisplayerPanel into TextFields.xaml
1 parent 06daa7c commit 37e94a4

File tree

2 files changed

+69
-65
lines changed

2 files changed

+69
-65
lines changed

‎MainDemo.Wpf/TextFields.xaml

Lines changed: 61 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,15 @@
88
xmlns:domain1="clr-namespace:MaterialDesignDemo.Domain"
99
xmlns:codeDisplayer="clr-namespace:CodeDisplayer;assembly=CodeDisplayer"
1010
mc:Ignorable="d"
11-
d:DesignHeight="300" d:DesignWidth="600" Loaded="UserControl_Loaded"
11+
Loaded="UserControl_Loaded"
1212
d:DataContext="{d:DesignInstance domain:TextFieldsViewModel, d:IsDesignTimeCreatable=False}">
1313
<UserControl.Resources>
1414
<ResourceDictionary>
1515
<ResourceDictionary.MergedDictionaries>
16-
<!-- note you only need bring in these extra resource dictionaries when using non-default styles, so only bring them into your controls where the default style is not what you want -->
1716
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ComboBox.xaml" />
1817
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Slider.xaml" />
1918
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TextBox.xaml" />
2019
</ResourceDictionary.MergedDictionaries>
21-
<Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource MaterialDesignTextBox}">
22-
<Setter Property="Margin" Value="0 8 0 8" />
23-
</Style>
2420
<Style TargetType="{x:Type PasswordBox}" BasedOn="{StaticResource MaterialDesignPasswordBox}">
2521
<Setter Property="Margin" Value="0 8 0 8" />
2622
</Style>
@@ -54,42 +50,51 @@
5450
</Binding>
5551
</TextBox.Text>
5652
</TextBox>
57-
<TextBlock VerticalAlignment="Center" Margin="16 0 8 0">OS</TextBlock>
58-
<ComboBox materialDesign:HintAssist.Hint="OS">
59-
<ComboBoxItem>Android</ComboBoxItem>
60-
<ComboBoxItem>iOS</ComboBoxItem>
61-
<ComboBoxItem>Linux</ComboBoxItem>
62-
<ComboBoxItem>Windows</ComboBoxItem>
63-
</ComboBox>
64-
<TextBlock Style="{StaticResource MaterialDesignHeadlineTextBlock}" Margin="32 0 0 0">Multi-line</TextBlock>
65-
<TextBox TextWrapping="Wrap" VerticalAlignment="Stretch" Margin="32 0 0 0"
66-
MinWidth="280"
53+
<StackPanel Orientation="Horizontal">
54+
<TextBlock VerticalAlignment="Center" Margin="0 0 8 0">OS</TextBlock>
55+
<ComboBox materialDesign:HintAssist.Hint="OS">
56+
<ComboBoxItem>Android</ComboBoxItem>
57+
<ComboBoxItem>iOS</ComboBoxItem>
58+
<ComboBoxItem>Linux</ComboBoxItem>
59+
<ComboBoxItem>Windows</ComboBoxItem>
60+
</ComboBox>
61+
</StackPanel>
62+
<TextBlock Style="{StaticResource MaterialDesignHeadlineTextBlock}" >Multi-line</TextBlock>
63+
<TextBox TextWrapping="Wrap" VerticalAlignment="Stretch"
64+
MaxWidth="300"
6765
AcceptsReturn="True"
6866
VerticalScrollBarVisibility="Auto"
6967
SpellCheck.IsEnabled="True"
7068
materialDesign:HintAssist.Hint="Multiline text"
7169
Height="80">Multiline. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. The quick brown fox jumps over the lazy dog. War and peace. Keep going. Go on. For how long? Not long. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</TextBox>
72-
<materialDesign:PackIcon Kind="Phone" Foreground="{Binding ElementName=PhoneTextBox, Path=BorderBrush}" />
73-
<TextBox
70+
<StackPanel Orientation="Horizontal">
71+
<materialDesign:PackIcon Kind="Phone" Margin="0 0 8 0" Foreground="{Binding ElementName=PhoneTextBox, Path=BorderBrush}" />
72+
<TextBox
7473
x:Name="PhoneTextBox"
7574
materialDesign:TransitionAssist.DisableTransitions="True"
75+
Width="150"
7676
/>
77-
<TextBlock VerticalAlignment="Center" Margin="16 0 8 0">Fruit</TextBlock>
78-
<ComboBox materialDesign:HintAssist.Hint="Search"
77+
</StackPanel>
78+
<StackPanel Orientation="Horizontal">
79+
<TextBlock VerticalAlignment="Center" Margin="0 0 8 0" >Fruit</TextBlock>
80+
<ComboBox materialDesign:HintAssist.Hint="Search"
7981
IsEditable="True" materialDesign:HintAssist.HintOpacity=".26">
80-
<ComboBoxItem>Apple</ComboBoxItem>
81-
<ComboBoxItem>Banana</ComboBoxItem>
82-
<ComboBoxItem>Pear</ComboBoxItem>
83-
<ComboBoxItem>Orange</ComboBoxItem>
84-
</ComboBox>
82+
<ComboBoxItem>Apple</ComboBoxItem>
83+
<ComboBoxItem>Banana</ComboBoxItem>
84+
<ComboBoxItem>Pear</ComboBoxItem>
85+
<ComboBoxItem>Orange</ComboBoxItem>
86+
</ComboBox>
87+
</StackPanel>
8588
<TextBox
8689
x:Name="CommentTextBox"
8790
materialDesign:HintAssist.Hint="Comment"
8891
/>
89-
<materialDesign:PackIcon Kind="Key" Foreground="{Binding ElementName=PasswordBox, Path=BorderBrush}" HorizontalAlignment="Right" />
90-
<PasswordBox
92+
<StackPanel Orientation="Horizontal">
93+
<materialDesign:PackIcon Margin="0 0 8 0" Kind="Key" Foreground="{Binding ElementName=PasswordBox, Path=BorderBrush}" HorizontalAlignment="Right" />
94+
<PasswordBox
9195
x:Name="PasswordBox"
9296
materialDesign:HintAssist.Hint="Password" />
97+
</StackPanel>
9398
<TextBox materialDesign:HintAssist.Hint="Floating Hint"
9499
Style="{StaticResource MaterialDesignFloatingHintTextBox}" />
95100
<ComboBox materialDesign:HintAssist.Hint="OS" Style="{StaticResource MaterialDesignFloatingHintComboBox}">
@@ -100,7 +105,7 @@
100105
</ComboBox>
101106
<ComboBox materialDesign:HintAssist.Hint="Virtualisation"
102107
MinWidth="72"
103-
Margin="0 0 0 0"
108+
104109
VerticalAlignment="Bottom"
105110
ItemsSource="{Binding LongListToTestComboVirtualization}"
106111
SelectedValue="{Binding SelectedValueOne}">
@@ -119,7 +124,7 @@
119124
</ComboBox>
120125
<ComboBox materialDesign:HintAssist.Hint="(editable)"
121126
MinWidth="72"
122-
Margin="16 0 0 0"
127+
123128
VerticalAlignment="Bottom"
124129
IsEditable="True"
125130
ItemsSource="{Binding LongListToTestComboVirtualization}">
@@ -138,7 +143,7 @@
138143
</ComboBox>
139144
<ComboBox materialDesign:HintAssist.Hint="(float hint)"
140145
MinWidth="72"
141-
Margin="16 0 0 0"
146+
142147
ItemsSource="{Binding LongListToTestComboVirtualization}"
143148
Style="{StaticResource MaterialDesignFloatingHintComboBox}">
144149
<ComboBox.ItemsPanel>
@@ -147,25 +152,24 @@
147152
</ItemsPanelTemplate>
148153
</ComboBox.ItemsPanel>
149154
</ComboBox>
150-
<TextBox Style="{StaticResource MaterialDesignFloatingHintTextBox}" Text="Good stuff"
151-
Margin="0 8 0 8">
155+
<TextBox Margin="0 0 8 0" Style="{StaticResource MaterialDesignFloatingHintTextBox}" Text="Good stuff">
152156
<materialDesign:HintAssist.Hint>
153-
<StackPanel Orientation="Horizontal" Margin="-2 0 0 0">
157+
<StackPanel Orientation="Horizontal" >
154158
<materialDesign:PackIcon Kind="AccessPoint" />
155159
<TextBlock>WiFi</TextBlock>
156160
</StackPanel>
157161
</materialDesign:HintAssist.Hint>
158162
</TextBox>
159163
<ComboBox materialDesign:HintAssist.Hint="Search" IsEditable="True" Style="{StaticResource MaterialDesignFloatingHintComboBox}"
160-
Margin="0 8 0 8">
164+
>
161165
<ComboBoxItem IsSelected="True">Apple</ComboBoxItem>
162166
<ComboBoxItem>Banana</ComboBoxItem>
163167
<ComboBoxItem>Pear</ComboBoxItem>
164168
<ComboBoxItem>Orange</ComboBoxItem>
165169
</ComboBox>
166170
<PasswordBox
167171
x:Name="FloatingPasswordBox"
168-
Margin="0 12 0 0"
172+
169173
materialDesign:HintAssist.Hint="Floating Password"
170174
Style="{StaticResource MaterialDesignFloatingHintPasswordBox}" />
171175

@@ -178,43 +182,43 @@
178182
FontSize="24"/>
179183

180184
<TextBlock Style="{StaticResource MaterialDesignSubheadingTextBlock}"
181-
Margin="0 48 0 0">DataTemplate Test</TextBlock>
185+
>DataTemplate Test</TextBlock>
182186
<ContentControl
183187
Content="{Binding DemoItem}"
184-
Margin="0 12 0 0">
188+
>
185189
<ContentControl.ContentTemplate>
186190
<DataTemplate DataType="domain:DemoItem">
187191
<StackPanel Orientation="Horizontal">
188-
<TextBox materialDesign:HintAssist.Hint="Name" Text="{Binding Name}" Margin="0 0 0 0" VerticalAlignment="Bottom" />
189-
<TextBox materialDesign:HintAssist.Hint="Content" Text="{Binding Content}" Margin="8 0 0 0" VerticalAlignment="Bottom" />
190-
<TextBox Style="{StaticResource MaterialDesignFloatingHintTextBox}" materialDesign:HintAssist.Hint="Name" Text="{Binding Name}" Margin="8 0 0 0" VerticalAlignment="Bottom" />
191-
<TextBox Style="{StaticResource MaterialDesignFloatingHintTextBox}" materialDesign:HintAssist.Hint="Content" Text="{Binding Content}" Margin="8 0 0 0" VerticalAlignment="Bottom" />
192+
<TextBox Margin="0 0 5 0" materialDesign:HintAssist.Hint="Name" Text="{Binding Name}" VerticalAlignment="Bottom" />
193+
<TextBox Margin="0 0 5 0" materialDesign:HintAssist.Hint="Content" Text="{Binding Content}" VerticalAlignment="Bottom" />
194+
<TextBox Margin="0 0 5 0" Style="{StaticResource MaterialDesignFloatingHintTextBox}" materialDesign:HintAssist.Hint="Name" Text="{Binding Name}" VerticalAlignment="Bottom" />
195+
<TextBox Margin="0 0 5 0" Style="{StaticResource MaterialDesignFloatingHintTextBox}" materialDesign:HintAssist.Hint="Content" Text="{Binding Content}" VerticalAlignment="Bottom" />
192196
</StackPanel>
193197
</DataTemplate>
194198
</ContentControl.ContentTemplate>
195199
</ContentControl>
196200
<TextBlock Style="{StaticResource MaterialDesignSubheadingTextBlock}"
197-
Margin="0 16 0 0">DataTemplateSelector Test</TextBlock>
201+
>DataTemplateSelector Test</TextBlock>
198202
<ContentControl
199203
Content="{Binding DemoItem}"
200-
Margin="0 12 0 0">
204+
>
201205
<ContentControl.ContentTemplateSelector>
202206
<domain1:SimpleDataTemplateSelector>
203207
<domain1:SimpleDataTemplateSelector.FixedTemplate>
204208
<DataTemplate DataType="domain:DemoItem">
205209
<StackPanel Orientation="Horizontal">
206-
<TextBox Style="{StaticResource MaterialDesignFloatingHintTextBox}" materialDesign:HintAssist.Hint="Name" Text="{Binding Name}" Margin="0 0 0 0" VerticalAlignment="Bottom" />
207-
<TextBox Style="{StaticResource MaterialDesignFloatingHintTextBox}" materialDesign:HintAssist.Hint="Content" Text="{Binding Content}" Margin="8 0 0 0" VerticalAlignment="Bottom" />
208-
<TextBox materialDesign:HintAssist.Hint="Name" Text="{Binding Name}" Margin="8 0 0 0" VerticalAlignment="Bottom" />
209-
<TextBox materialDesign:HintAssist.Hint="Content" Text="{Binding Content}" Margin="8 0 0 0" VerticalAlignment="Bottom" />
210+
<TextBox Margin="0 0 5 0" Style="{StaticResource MaterialDesignFloatingHintTextBox}" materialDesign:HintAssist.Hint="Name" Text="{Binding Name}" VerticalAlignment="Bottom" />
211+
<TextBox Margin="0 0 5 0" Style="{StaticResource MaterialDesignFloatingHintTextBox}" materialDesign:HintAssist.Hint="Content" Text="{Binding Content}" VerticalAlignment="Bottom" />
212+
<TextBox Margin="0 0 5 0" materialDesign:HintAssist.Hint="Name" Text="{Binding Name}" VerticalAlignment="Bottom" />
213+
<TextBox Margin="0 0 5 0" materialDesign:HintAssist.Hint="Content" Text="{Binding Content}" VerticalAlignment="Bottom" />
210214
</StackPanel>
211215
</DataTemplate>
212216
</domain1:SimpleDataTemplateSelector.FixedTemplate>
213217
</domain1:SimpleDataTemplateSelector>
214218
</ContentControl.ContentTemplateSelector>
215219
</ContentControl>
216220
<TextBlock Style="{StaticResource MaterialDesignSubheadingTextBlock}"
217-
Margin="0 48 0 0">Tight Space Validation</TextBlock>
221+
>Tight Space Validation</TextBlock>
218222
<TextBox Width="20"
219223
materialDesign:ValidationAssist.UsePopup="True"
220224
HorizontalAlignment="Left"
@@ -230,10 +234,10 @@
230234
<CheckBox
231235
x:Name="DisplaySelectedItemCheckBox"
232236
IsThreeState="False"
233-
Margin="0 8 0 0">Display Selected Item In Drop Down</CheckBox>
237+
>Display Selected Item In Drop Down</CheckBox>
234238
<ComboBox
235239
materialDesign:ComboBoxAssist.ShowSelectedItem="{Binding ElementName=DisplaySelectedItemCheckBox, Path=IsChecked}"
236-
Margin="0 8 0 8" HorizontalAlignment="Left">
240+
HorizontalAlignment="Left">
237241
<ComboBoxItem IsSelected="True">Apple</ComboBoxItem>
238242
<ComboBoxItem>Banana</ComboBoxItem>
239243
<ComboBoxItem>Pear</ComboBoxItem>
@@ -242,26 +246,26 @@
242246
<CheckBox
243247
x:Name="ClassicModeCheckBox"
244248
IsThreeState="False" IsChecked="True"
245-
Margin="0 8 0 0">Use classic mode</CheckBox>
249+
>Use classic mode</CheckBox>
246250
<ComboBox
247251
materialDesign:ComboBoxAssist.ClassicMode="{Binding ElementName=ClassicModeCheckBox, Path=IsChecked}"
248-
Margin="0 8 0 8" HorizontalAlignment="Left">
252+
HorizontalAlignment="Left">
249253
<ComboBoxItem IsSelected="True">Apple</ComboBoxItem>
250254
<ComboBoxItem>Banana</ComboBoxItem>
251255
<ComboBoxItem>Pear</ComboBoxItem>
252256
<ComboBoxItem>Orange</ComboBoxItem>
253257
</ComboBox>
254-
<TextBlock Style="{StaticResource MaterialDesignHeadlineTextBlock}" Margin="0,32,0,16">Text field box</TextBlock>
258+
<TextBlock Style="{StaticResource MaterialDesignHeadlineTextBlock}" >Text field box</TextBlock>
255259
<CheckBox x:Name="MaterialDesignTextFieldBoxTextBoxEnabledComboBox"
256-
IsChecked="True" Margin="0,0,0,8">Enabled</CheckBox>
260+
IsChecked="True" >Enabled</CheckBox>
257261
<TextBox Style="{StaticResource MaterialDesignTextFieldBoxTextBox}"
258262
VerticalAlignment="Top" AcceptsReturn="True" TextWrapping="Wrap" MaxWidth="400" materialDesign:HintAssist.Hint="Floating hint in a box"
259263
IsEnabled="{Binding Path=IsChecked, ElementName=MaterialDesignTextFieldBoxTextBoxEnabledComboBox}" />
260-
<TextBlock Style="{StaticResource MaterialDesignHeadlineTextBlock}" Margin="32,32,0,16">Text area box</TextBlock>
264+
<TextBlock Style="{StaticResource MaterialDesignHeadlineTextBlock}" >Text area box</TextBlock>
261265
<CheckBox x:Name="MaterialDesignTextAreaTextBoxEnabledComboBox"
262-
IsChecked="True" Margin="32,0,0,8">Enabled</CheckBox>
263-
<TextBox Style="{StaticResource MaterialDesignTextAreaTextBox}" Margin="32,0,0,0"
266+
IsChecked="True" >Enabled</CheckBox>
267+
<TextBox Style="{StaticResource MaterialDesignTextAreaTextBox}"
264268
VerticalAlignment="Top" Height="100" AcceptsReturn="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" materialDesign:HintAssist.Hint="This is a text area"
265269
IsEnabled="{Binding Path=IsChecked, ElementName=MaterialDesignTextAreaTextBoxEnabledComboBox}" />
266270
</codeDisplayer:XamlDisplayerPanel>
267-
</UserControl>
271+
</UserControl>

‎MainDemo.Wpf/TextFields.xaml.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ public TextFields()
3030
{
3131
InitializeComponent();
3232
DataContext = new TextFieldsViewModel();
33-
//var xmlDoc = new XmlDocument();
34-
//xmlDoc.Load(@"..\..\TextFields.xaml");
35-
XmlDocument xmlDoc =
36-
new MaterialDesignInXamlToolkitGitHubFile(
37-
ownerName: "wongjiahau" ,
38-
branchName: "New-Demo-2" ,
39-
fileName: "TextFields.xaml")
40-
.GetXmlDocument();
33+
var xmlDoc = new XmlDocument();
34+
xmlDoc.Load(@"..\..\TextFields.xaml");
35+
//XmlDocument xmlDoc =
36+
// new MaterialDesignInXamlToolkitGitHubFile(
37+
// ownerName: "wongjiahau" ,
38+
// branchName: "New-Demo-2" ,
39+
// fileName: "TextFields.xaml")
40+
// .GetXmlDocument();
4141
XamlDisplayerPanel.Initialize(xmlDoc);
4242

4343
}

0 commit comments

Comments
 (0)