Skip to content

Commit 671008d

Browse files
committed
Merge branch 'FixTypos' of https://github.com/spiegelp/MaterialDesignInXamlToolkit into spiegelp-FixTypos
2 parents 63b6390 + a56700f commit 671008d

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

MainDemo.Wpf/Dialogs.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
<!--#region SAMPLE 4-->
146146
<TextBlock TextWrapping="Wrap" HorizontalAlignment="Center" VerticalAlignment="Top"
147147
Grid.Column="3" Margin="8 0 8 0"
148-
>SAMPLE 4: Dialog managed managed from view model using IsOpen and custom commands (ignoring the provided routed commands).</TextBlock>
148+
>SAMPLE 4: Dialog managed from view model using IsOpen and custom commands (ignoring the provided routed commands).</TextBlock>
149149
<materialDesign:DialogHost Grid.Column="3" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center"
150150
IsOpen="{Binding IsSample4DialogOpen}"
151151
DialogContent="{Binding Sample4Content}">

MaterialDesignThemes.Wpf/DialogHost.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -123,35 +123,35 @@ public static async Task<object> Show(object content, DialogOpenedEventHandler o
123123
/// Shows a modal dialog. To use, a <see cref="DialogHost"/> instance must be in a visual tree (typically this may be specified towards the root of a Window's XAML).
124124
/// </summary>
125125
/// <param name="content">Content to show (can be a control or view model).</param>
126-
/// <param name="dialogIndetifier"><see cref="Identifier"/> of the instance where the dialog should be shown. Typically this will match an identifer set in XAML. <c>null</c> is allowed.</param>
126+
/// <param name="dialogIdentifier"><see cref="Identifier"/> of the instance where the dialog should be shown. Typically this will match an identifer set in XAML. <c>null</c> is allowed.</param>
127127
/// <returns>Task result is the parameter used to close the dialog, typically what is passed to the <see cref="CloseDialogCommand"/> command.</returns>
128-
public static async Task<object> Show(object content, object dialogIndetifier)
128+
public static async Task<object> Show(object content, object dialogIdentifier)
129129
{
130-
return await Show(content, dialogIndetifier, null, null);
130+
return await Show(content, dialogIdentifier, null, null);
131131
}
132132

133133
/// <summary>
134134
/// Shows a modal dialog. To use, a <see cref="DialogHost"/> instance must be in a visual tree (typically this may be specified towards the root of a Window's XAML).
135135
/// </summary>
136136
/// <param name="content">Content to show (can be a control or view model).</param>
137-
/// <param name="dialogIndetifier"><see cref="Identifier"/> of the instance where the dialog should be shown. Typically this will match an identifer set in XAML. <c>null</c> is allowed.</param>
137+
/// <param name="dialogIdentifier"><see cref="Identifier"/> of the instance where the dialog should be shown. Typically this will match an identifer set in XAML. <c>null</c> is allowed.</param>
138138
/// <param name="openedEventHandler">Allows access to opened event which would otherwise have been subscribed to on a instance.</param>
139139
/// <returns>Task result is the parameter used to close the dialog, typically what is passed to the <see cref="CloseDialogCommand"/> command.</returns>
140-
public static Task<object> Show(object content, object dialogIndetifier, DialogOpenedEventHandler openedEventHandler)
140+
public static Task<object> Show(object content, object dialogIdentifier, DialogOpenedEventHandler openedEventHandler)
141141
{
142-
return Show(content, dialogIndetifier, openedEventHandler, null);
142+
return Show(content, dialogIdentifier, openedEventHandler, null);
143143
}
144144

145145
/// <summary>
146146
/// Shows a modal dialog. To use, a <see cref="DialogHost"/> instance must be in a visual tree (typically this may be specified towards the root of a Window's XAML).
147147
/// </summary>
148148
/// <param name="content">Content to show (can be a control or view model).</param>
149-
/// <param name="dialogIndetifier"><see cref="Identifier"/> of the instance where the dialog should be shown. Typically this will match an identifer set in XAML. <c>null</c> is allowed.</param>
149+
/// <param name="dialogIdentifier"><see cref="Identifier"/> of the instance where the dialog should be shown. Typically this will match an identifer set in XAML. <c>null</c> is allowed.</param>
150150
/// <param name="closingEventHandler">Allows access to closing event which would otherwise have been subscribed to on a instance.</param>
151151
/// <returns>Task result is the parameter used to close the dialog, typically what is passed to the <see cref="CloseDialogCommand"/> command.</returns>
152-
public static Task<object> Show(object content, object dialogIndetifier, DialogClosingEventHandler closingEventHandler)
152+
public static Task<object> Show(object content, object dialogIdentifier, DialogClosingEventHandler closingEventHandler)
153153
{
154-
return Show(content, dialogIndetifier, null, closingEventHandler);
154+
return Show(content, dialogIdentifier, null, closingEventHandler);
155155
}
156156

157157
#endregion
@@ -160,19 +160,19 @@ public static Task<object> Show(object content, object dialogIndetifier, DialogC
160160
/// Shows a modal dialog. To use, a <see cref="DialogHost"/> instance must be in a visual tree (typically this may be specified towards the root of a Window's XAML).
161161
/// </summary>
162162
/// <param name="content">Content to show (can be a control or view model).</param>
163-
/// <param name="dialogIndetifier"><see cref="Identifier"/> of the instance where the dialog should be shown. Typically this will match an identifer set in XAML. <c>null</c> is allowed.</param>
163+
/// <param name="dialogIdentifier"><see cref="Identifier"/> of the instance where the dialog should be shown. Typically this will match an identifer set in XAML. <c>null</c> is allowed.</param>
164164
/// <param name="openedEventHandler">Allows access to opened event which would otherwise have been subscribed to on a instance.</param>
165165
/// <param name="closingEventHandler">Allows access to closing event which would otherwise have been subscribed to on a instance.</param>
166166
/// <returns>Task result is the parameter used to close the dialog, typically what is passed to the <see cref="CloseDialogCommand"/> command.</returns>
167-
public static async Task<object> Show(object content, object dialogIndetifier, DialogOpenedEventHandler openedEventHandler, DialogClosingEventHandler closingEventHandler)
167+
public static async Task<object> Show(object content, object dialogIdentifier, DialogOpenedEventHandler openedEventHandler, DialogClosingEventHandler closingEventHandler)
168168
{
169169
if (content == null) throw new ArgumentNullException(nameof(content));
170170

171171
if (LoadedInstances.Count == 0)
172172
throw new InvalidOperationException("No loaded DialogHost instances.");
173173
LoadedInstances.First().Dispatcher.VerifyAccess();
174174

175-
var targets = LoadedInstances.Where(dh => Equals(dh.Identifier, dialogIndetifier)).ToList();
175+
var targets = LoadedInstances.Where(dh => Equals(dh.Identifier, dialogIdentifier)).ToList();
176176
if (targets.Count == 0)
177177
throw new InvalidOperationException("No loaded DialogHost have an Identifier property matching dialogIndetifier argument.");
178178
if (targets.Count > 1)
@@ -269,7 +269,7 @@ private static void IsOpenPropertyChangedCallback(DependencyObject dependencyObj
269269
child.MoveFocus(new TraversalRequest(FocusNavigationDirection.Next));
270270

271271
//https://github.com/ButchersBoy/MaterialDesignInXamlToolkit/issues/187
272-
//totally not happy about this, but on immediate validation we can get some wierd looking stuff...give WPF a kick to refresh...
272+
//totally not happy about this, but on immediate validation we can get some weird looking stuff...give WPF a kick to refresh...
273273
Task.Delay(300).ContinueWith(t => child.Dispatcher.BeginInvoke(new Action(() => child.InvalidateVisual())));
274274
}));
275275
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ To load the source project you will need Visual Studio 2015. Don't worry if you
4545
* Logo courtesy of GitHub user [Snalty](https://github.com/snalty), and you can see more of him;
4646
* on his [blog](http://holothere.tumblr.com/)
4747
* and on [Twitter](https://twitter.com/snalty)
48-
* Marc Angers - I pulled some oh his shadows straight in from this [blog post](http://marcangers.com/material-design-shadows-in-wpf/)
48+
* Marc Angers - I pulled some of his shadows straight in from this [blog post](http://marcangers.com/material-design-shadows-in-wpf/)
4949
* Icon pack sourced from [Material Design Icons](https://materialdesignicons.com/)
5050
* Utilises [ControlzEx](https://github.com/ControlzEx/ControlzEx)
5151
* Ignace Maes, whose [Material Skin](https://github.com/IgnaceMaes/MaterialSkin) project inspired the original material design theme for [Dragablz](https://github.com/ButchersBoy/Dragablz), which in turn led to me starting this project

0 commit comments

Comments
 (0)